Remove fcntl.h includes throughout.
* fhandler.h: Move fcntl.h include here. (fhandler_base::set_flags): Accept supplied_bin argument. Make non-inlined. * dtable.cc (dtable::init_std_file_from_handle): Just use binmode from pc. (reset_to_open_binmode): Use set_flags. * cygwin.din (open): Avoid newlib wrapper. (read): Ditto. (unlink): Ditto. (write): Ditto. * fhandler.cc (fhandler_base::set_flags): Accept supplied_bin argument. Make binmode decisions here. (fhandler_base::open): Avoid using pc if it is NULL. Eliminate binmode logic. Just call set_flags with binmode argument. (fhandler_base::init): Call set_flags with binmode argument. * fhandler_clipboard.cc (fhandler_dev_clipboard::open): Ditto. * fhandler_console.cc (fhandler_console::open): Ditto. (fhandler_console::init): Force binary on open. * fhandler_disk_file.cc (fhandler_disk_file::open): Don't set binmode here. Let it happen in base class. * fhandler_dsp.cc (fhandler_dev_dsp::open): Force binmode open. Set return value appropriately if unable to open. * fhandler_proc.cc (fhandler_proc::open): Make sure flags are set before open_status. * fhandler_process.cc (fhandler_process::open): Ditto. * fhandler_registry.cc (fhandler_registry::open): Ditto. * fhandler_random.cc (fhandler_dev_random::fhandler_dev_random): Ditto. * fhandler_raw.cc (fhandler_dev_raw::open): Force O_BINARY by default. * fhandler_serial.cc (fhandler_serial::init): Ditto. * fhandler_tty.cc (fhandler_tty_slave::open): Ditto. (fhandler_pty_master::open): Ditto. * fhandler_virtual.cc (fhandler_virtual::open): Ditto. * fhandler_windows.cc (fhandler_windows::open): Ditto. * fhandler_zero.cc (fhandler_dev_zero::open): Ditto. * net.cc (fdsock): Ditto. * path.cc (path_conv::check): Avoid checking for extension when error or directory. (set_flags): Set PATH_TEXT explicitly, when appropriate. (mount_info::conv_to_win32_path): Use set_flags() to set path flags. * path.h (PATH_TEXT): New enum. (path_conv::binmode): Return appropriate constant based on binmode. * pipe.cc (make_pipe): Set binmode to O_TEXT xor O_BINARY. * syscalls.cc (setmode_helper): Make debugging message a little clearer. (setmode): Set binmode via set_flags.
This commit is contained in:
@@ -11,7 +11,6 @@ details. */
|
||||
#include "winsup.h"
|
||||
#include <sys/stat.h>
|
||||
#include <sys/vfs.h> /* needed for statfs */
|
||||
#include <fcntl.h>
|
||||
#include <pwd.h>
|
||||
#include <grp.h>
|
||||
#include <stdlib.h>
|
||||
@@ -1624,8 +1623,8 @@ setmode_helper (FILE *f)
|
||||
if (fileno (f) != setmode_file)
|
||||
return 0;
|
||||
syscall_printf ("setmode: file was %s now %s\n",
|
||||
f->_flags & __SCLE ? "cle" : "raw",
|
||||
setmode_mode & O_TEXT ? "cle" : "raw");
|
||||
f->_flags & __SCLE ? "text" : "raw",
|
||||
setmode_mode & O_TEXT ? "text" : "raw");
|
||||
if (setmode_mode & O_TEXT)
|
||||
f->_flags |= __SCLE;
|
||||
else
|
||||
@@ -1673,16 +1672,8 @@ setmode (int fd, int mode)
|
||||
|
||||
if (!mode)
|
||||
cfd->reset_to_open_binmode ();
|
||||
else if (mode & O_BINARY)
|
||||
{
|
||||
cfd->set_w_binary (1);
|
||||
cfd->set_r_binary (1);
|
||||
}
|
||||
else
|
||||
{
|
||||
cfd->set_w_binary (0);
|
||||
cfd->set_r_binary (0);
|
||||
}
|
||||
cfd->set_flags ((cfd->get_flags () & ~(O_TEXT | O_BINARY)) | mode);
|
||||
|
||||
if (_cygwin_istext_for_stdio (fd))
|
||||
setmode_mode = O_TEXT;
|
||||
@@ -1691,9 +1682,8 @@ setmode (int fd, int mode)
|
||||
setmode_file = fd;
|
||||
_fwalk (_REENT, setmode_helper);
|
||||
|
||||
syscall_printf ("setmode (%d<%s>, %s) returns %s\n", fd, cfd->get_name (),
|
||||
mode & O_TEXT ? "text" : "binary",
|
||||
res & O_TEXT ? "text" : "binary");
|
||||
syscall_printf ("setmode (%d<%s>, %p) returns %s\n", fd, cfd->get_name (),
|
||||
mode, res & O_TEXT ? "text" : "binary");
|
||||
return res;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user