JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler.cc (fhandler_base::set_flags): Change priority of "linked in"

Browse Source 
default binmode setting so that it has priority over optional setting.
This commit is contained in:
Christopher Faylor 2002-06-20 00:36:40 +00:00
parent 6311ef8575
commit c25ebbaf55
2 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2002-06-19 Christopher Faylor <cgf@redhat.com>
* fhandler.cc (fhandler_base::set_flags): Change priority of "linked
in" default binmode setting so that it has priority over optional
setting.
2002-06-19 Christopher Faylor <cgf@redhat.com> 2002-06-19 Christopher Faylor <cgf@redhat.com>
Use hMainProc where appropriate, throughout. Use hMainProc where appropriate, throughout.

55
winsup/cygwin/fhandler.cc
View File

@ -57,33 +57,6 @@ fhandler_base::puts_readahead (const char *s, size_t len)
return success; 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 int
fhandler_base::put_readahead (char value) fhandler_base::put_readahead (char value)
{ {
@ -243,6 +216,34 @@ is_at_eof (HANDLE h, DWORD err)
return 0; return 0;
} }
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 ((fmode = get_default_fmode (flags)) & O_BINARY)
bin = O_BINARY;
else if (fmode & O_TEXT)
bin = O_TEXT;
else if (supplied_bin)
bin = supplied_bin;
else
bin = get_w_binary () || get_r_binary () || (binmode != O_TEXT) ?
O_BINARY : O_TEXT;
openflags = flags | bin;
bin &= O_BINARY;
set_r_binary (bin);
set_w_binary (bin);
syscall_printf ("filemode set to %s", bin ? "binary" : "text");
}
/* Normal file i/o handlers. */ /* Normal file i/o handlers. */
/* Cover function to ReadFile to achieve (as much as possible) Posix style /* Cover function to ReadFile to achieve (as much as possible) Posix style