From 74d8e12e16d5d5416ce37100f8767ff0affa90ec Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Tue, 1 Feb 2005 16:49:13 +0000 Subject: * cygthread.cc (cygthread::terminate_thread): Wait briefly for notification event in the event that the thread was actually in the process of exiting. * pipe.cc (fhandler_pipe::dup): read_state is not supposed to be inheritable. Fix that. * path.cc (path_conv::check): Set symlen = 0 to avoid a compiler warning. * devices.h (devices::parsedisk): Declare new function. * devices.in (devices::parsedisk): Define new function. * dtable.cc (dtable::init_std_file_from_handle): Use device numbers rather than name. * fhandler_proc.cc (format_proc_partitions): Use parsedisk to generate disk names from numeric codes. (This was broken on two of my systems previously and is still broken now) --- winsup/cygwin/dtable.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'winsup/cygwin/dtable.cc') diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc index a699553c1..22befcdb4 100644 --- a/winsup/cygwin/dtable.cc +++ b/winsup/cygwin/dtable.cc @@ -273,14 +273,14 @@ dtable::init_std_file_from_handle (int fd, HANDLE handle) if (GetConsoleScreenBufferInfo (handle, &buf)) { if (ISSTATE (myself, PID_USETTY)) - dev.parse ("/dev/tty"); + dev.parse (FH_TTY); else dev = *console_dev; } else if (GetNumberOfConsoleInputEvents (handle, (DWORD *) &buf)) { if (ISSTATE (myself, PID_USETTY)) - dev.parse ("/dev/tty"); + dev.parse (FH_TTY); else dev = *console_dev; } @@ -294,7 +294,7 @@ dtable::init_std_file_from_handle (int fd, HANDLE handle) else if (wsock_started && getpeername ((SOCKET) handle, &sa, &sal) == 0) dev = *tcp_dev; else if (GetCommState (handle, &dcb)) - dev.parse ("/dev/ttyS0"); + dev.parse (DEV_TTYS_MAJOR, 0); else { name = handle_to_fn (handle, (char *) alloca (CYG_MAX_PATH + 100)); -- cgit v1.2.3