2002-05-31 Christopher Faylor <cgf@redhat.com>
+ * fhandler_console.cc (fhandler_console::open): Reinstate setting of
+ flags.
+
+2002-05-31 Christopher Faylor <cgf@redhat.com>
+
* fhandler_console.cc (fhandler_console::open): Always default to
binmode.
(fhandler_console::write_normal): Don't honor binmode setting. There
void
dtable::init_std_file_from_handle (int fd, HANDLE handle, DWORD myaccess)
{
- int bin = 0;
+ int bin = -1;
const char *name;
CONSOLE_SCREEN_BUFFER_INFO buf;
struct sockaddr sa;
if (__fmode)
bin = __fmode;
else
- bin = binmode ?: 0;
+ bin = (int) binmode ?: -1;
/* See if we can consoleify it - if it is a console,
don't open it in binary. That will screw up our crlfs*/
else
{
path_conv pc;
- build_fhandler_from_name (fd, name, handle, pc)->init (handle, myaccess, bin);
+ build_fhandler_from_name (fd, name, handle, pc)->init (handle, myaccess,
+ bin < 0 ? pc.isbinary () : bin);
set_std_handle (fd);
paranoid_printf ("fd %d, handle %p", fd, handle);
}
set_errno (ENOTDIR);
return -1;
}
+bool fhandler_base::get_w_binary () { return FHISSETF (WBINSET) ? FHISSETF (WBINARY) : 1; }
+bool fhandler_base::get_r_binary () { return FHISSETF (RBINSET) ? FHISSETF (RBINARY) : 1; }
bool is_nonblocking ();
void set_nonblocking (int yes);
- bool get_w_binary () { return FHISSETF (WBINARY); }
- bool get_r_binary () { return FHISSETF (RBINARY); }
+ bool get_w_binary () { return FHISSETF (WBINSET) ? FHISSETF (WBINARY) : 1; }
+ bool get_r_binary () { return FHISSETF (RBINSET) ? FHISSETF (RBINARY) : 1; }
bool get_w_binset () { return FHISSETF (WBINSET); }
bool get_r_binset () { return FHISSETF (RBINSET); }
set_io_handle (INVALID_HANDLE_VALUE);
set_output_handle (INVALID_HANDLE_VALUE);
+ set_flags (flags);
set_w_binary (1);
set_r_binary (1);
int __stdcall
fhandler_disk_file::fstat_by_handle (struct __stat64 *buf, path_conv *pc)
{
- int res;
+ int res = 0;
BY_HANDLE_FILE_INFORMATION local;
/* NT 3.51 seems to have a bug when attempting to get vol serial
if (tail[1] != '\0')
*tail = '/';
normalized_path = cstrdup (path_copy);
- debug_printf ("path_copy %s", path_copy);
}
/* Deal with Windows stupidity which considers filename\. to be valid
even when "filename" is not a directory. */
path_flags |= PATH_EXEC;
}
+ debug_printf ("binary %d", isbinary ());
#if 0
if (!error)
{