diff options
author | Christopher Faylor <me@cgf.cx> | 2002-06-05 05:42:28 +0400 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2002-06-05 05:42:28 +0400 |
commit | e35f391fa55a9f600bc564ef4e342344376bff25 (patch) | |
tree | 8e748ff71453491174254ce35becd46a0112c34a /winsup/cygwin/fhandler.cc | |
parent | 915d66ce9eba7954e968c8f6b4590253aa3b4e4d (diff) |
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.
Diffstat (limited to 'winsup/cygwin/fhandler.cc')
-rw-r--r-- | winsup/cygwin/fhandler.cc | 71 |
1 files changed, 35 insertions, 36 deletions
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index 820096bcc..67fe64f53 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -9,7 +9,6 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <sys/fcntl.h> #include <errno.h> #include <unistd.h> #include <stdlib.h> @@ -58,6 +57,33 @@ fhandler_base::puts_readahead (const char *s, size_t len) return success; } +void +fhandler_base::set_flags (int flags, int supplied_bin) +{ + int bin; + int fmode; + debug_printf ("flags %p, supplied_bin %p", flags, supplied_bin); + if ((bin = flags & (O_BINARY | O_TEXT))) + debug_printf ("O_TEXT/O_BINARY set in flags %p", bin); + else if (get_r_binset () && get_w_binset ()) + bin = get_r_binary () ? O_BINARY : O_TEXT; // FIXME: Not quite right + else if (supplied_bin) + bin = supplied_bin; + else if ((fmode = get_default_fmode (flags)) & O_BINARY) + bin = O_BINARY; + else if (fmode & O_TEXT) + bin = O_TEXT; + else + bin = get_w_binary () || get_r_binary () || (binmode != O_TEXT) ? + O_BINARY : O_TEXT; + + openflags = flags | bin; + + set_r_binary (bin & O_BINARY); + set_w_binary (bin & O_BINARY); + syscall_printf ("filemode set to %s", bin ? "binary" : "text"); +} + int fhandler_base::put_readahead (char value) { @@ -381,10 +407,8 @@ fhandler_base::open (path_conv *pc, int flags, mode_t mode) /* CreateFile() with dwDesiredAccess == 0 when called on remote share returns some handle, even if file doesn't exist. This code works around this bug. */ - if (get_query_open () && - isremote () && - creation_distribution == OPEN_EXISTING && - !pc->exists ()) + if (get_query_open () && isremote () && + creation_distribution == OPEN_EXISTING && pc && !pc->exists ()) { set_errno (ENOENT); goto done; @@ -424,30 +448,7 @@ fhandler_base::open (path_conv *pc, int flags, mode_t mode) set_file_attribute (has_acls (), get_win32_name (), mode); set_io_handle (x); - if (get_w_binset () && get_r_binset ()) - syscall_printf ("filemode already set to %d/%d", get_r_binary (), get_w_binary ()); - else - { - int bin; - int fmode; - if ((bin = flags & (O_BINARY | O_TEXT))) - /* nothing to do */; - else if ((fmode = get_default_fmode (flags)) & O_BINARY) - bin = O_BINARY; - else if (fmode & O_TEXT) - bin = O_TEXT; - else - bin = get_w_binary () || get_r_binary () || (binmode != O_TEXT); - - if (bin & O_TEXT) - bin = 0; - - set_flags (flags | (bin ? O_BINARY : O_TEXT)); - - set_r_binary (bin); - set_w_binary (bin); - syscall_printf ("filemode set to %s", bin ? "binary" : "text"); - } + set_flags (flags, pc ? pc->binmode () : 0); res = 1; set_open_status (); @@ -849,18 +850,16 @@ void fhandler_base::init (HANDLE f, DWORD a, mode_t bin) { set_io_handle (f); - set_r_binary (bin); - set_w_binary (bin); access = a; a &= GENERIC_READ | GENERIC_WRITE; - int oflags = 0; + int flags = 0; if (a == GENERIC_READ) - oflags = O_RDONLY; + flags = O_RDONLY; else if (a == GENERIC_WRITE) - oflags = O_WRONLY; + flags = O_WRONLY; else if (a == (GENERIC_READ | GENERIC_WRITE)) - oflags = O_RDWR; - set_flags (oflags | (bin ? O_BINARY : O_TEXT)); + flags = O_RDWR; + set_flags (flags, bin); set_open_status (); debug_printf ("created new fhandler_base for handle %p, bin %d", f, get_r_binary ()); } |