revert premature checkin

1 files changed, 20 insertions, 61 deletions

diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
index 019f8a1a6..f130a2ef7 100644
--- a/winsup/cygwin/dtable.cc
+++ b/winsup/cygwin/dtable.cc
@@ -41,17 +41,6 @@ static const NO_COPY DWORD std_consts[] = {STD_INPUT_HANDLE, STD_OUTPUT_HANDLE,
 
 static const char *handle_to_fn (HANDLE, char *);
 
-#define DEVICE_PREFIX "\\device\\"
-#define DEVICE_PREFIX_LEN sizeof (DEVICE_PREFIX) - 1
-#define REMOTE "\\Device\\LanmanRedirector\\"
-#define REMOTE_LEN sizeof (REMOTE) - 1
-#define REMOTE1 "\\Device\\WinDfs\\Root\\"
-#define REMOTE1_LEN sizeof (REMOTE1) - 1
-#define NAMED_PIPE "\\Device\\NamedPipe\\"
-#define NAMED_PIPE_LEN sizeof (NAMED_PIPE) - 1
-#define POSIX_NAMED_PIPE "/Device/NamedPipe/"
-#define POSIX_NAMED_PIPE_LEN sizeof (POSIX_NAMED_PIPE) - 1
-
 /* Set aside space for the table of fds */
 void
 dtable_init ()
@@ -294,7 +283,7 @@ dtable::init_std_file_from_handle (int fd, HANDLE handle)
 	  else
 	    dev = *console_dev;
 	}
-      else if (0 && ft == FILE_TYPE_PIPE)
+      else if (ft == FILE_TYPE_PIPE)
 	{
 	  if (fd == 0)
 	    dev = *piper_dev;
@@ -308,12 +297,7 @@ dtable::init_std_file_from_handle (int fd, HANDLE handle)
       else
 	{
 	  name = handle_to_fn (handle, (char *) alloca (CYG_MAX_PATH + 100));
-	  if (!strncasematch (name, POSIX_NAMED_PIPE, POSIX_NAMED_PIPE_LEN))
-	    /* nothing */;
-	  else if (fd == 0)
-	    dev = *piper_dev;
-	  else
-	    dev = *pipew_dev;
+	  bin = 0;
 	}
     }
 
@@ -324,31 +308,25 @@ dtable::init_std_file_from_handle (int fd, HANDLE handle)
       fhandler_base *fh;
 
       if (dev)
-	fh = build_fh_dev (dev, name);
+	fh = build_fh_dev (dev);
       else
 	fh = build_fh_name (name);
 
       if (fh)
 	cygheap->fdtab[fd] = fh;
 
-      if (name)
+      if (!bin)
 	{
-	  bin = fh->pc_binmode ();
-	  if (!bin)
-	    {
-	      bin = fh->get_default_fmode (O_RDWR);
-	      if (!bin && dev)
-		bin = O_BINARY;
-	    }
+	  bin = fh->get_default_fmode (O_RDWR);
+	  if (bin)
+	    /* nothing */;
+	  else if (dev)
+	    bin = O_BINARY;
+	  else if (name != unknown_file)
+	    bin = fh->pc_binmode ();
 	}
 
-      DWORD access;
-      if (fd == 0)
-	access = GENERIC_READ;
-      else 
-	access = GENERIC_WRITE;  /* Should be rdwr for stderr but not sure that's
-				    possible for some versions of handles */
-      fh->init (handle, access, bin);
+      fh->init (handle, GENERIC_READ | GENERIC_WRITE, bin);
       set_std_handle (fd);
       paranoid_printf ("fd %d, handle %p", fd, handle);
     }
@@ -847,6 +825,11 @@ dtable::vfork_child_fixup ()
 }
 #endif /*NEWVFORK*/
 
+#define DEVICE_PREFIX "\\device\\"
+#define DEVICE_PREFIX_LEN sizeof (DEVICE_PREFIX) - 1
+#define REMOTE "\\Device\\LanmanRedirector\\"
+#define REMOTE_LEN sizeof (REMOTE) - 1
+
 static const char *
 handle_to_fn (HANDLE h, char *posix_fn)
 {
@@ -861,7 +844,7 @@ handle_to_fn (HANDLE h, char *posix_fn)
   NTSTATUS res = NtQueryObject (h, ObjectNameInformation, ntfn, sizeof (fnbuf),
   				NULL);
 
-  if (!NT_SUCCESS (res))
+  if (NT_SUCCESS (res))
     {
       strcpy (posix_fn, unknown_file);
       debug_printf ("NtQueryObject failed");
@@ -918,7 +901,6 @@ handle_to_fn (HANDLE h, char *posix_fn)
     }
 
   char *w32 = win32_fn;
-  bool justslash = false;
   if (maxmatchlen)
     {
       n = strlen (maxmatchdos);
@@ -928,38 +910,15 @@ handle_to_fn (HANDLE h, char *posix_fn)
       memcpy (w32, maxmatchdos, n);
       w32[n] = '\\';
     }
-  else if (strncasematch (w32, NAMED_PIPE, NAMED_PIPE_LEN))
-    {
-      debug_printf ("pipe");
-      justslash = true;
-    }
   else if (strncasematch (w32, REMOTE, REMOTE_LEN))
     {
       w32 += REMOTE_LEN - 2;
       *w32 = '\\';
       debug_printf ("remote drive");
-      justslash = true;
-    }
-  else if (strncasematch (w32, REMOTE1, REMOTE1_LEN))
-    {
-      w32 += REMOTE1_LEN - 2;
-      *w32 = '\\';
-      debug_printf ("remote drive");
-      justslash = true;
     }
 
-  if (!justslash)
-    cygwin_conv_to_full_posix_path (w32, posix_fn);
-  else
-    {
-      char *s, *d;
-      for (s = w32, d = posix_fn; *s; s++, d++)
-	if (*s == '\\')
-	  *d = '/';
-	else
-	  *d = *s;
-    }
 
-  debug_printf ("derived path '%s', posix '%s'", w32, posix_fn);
+  debug_printf ("derived path '%s'", w32);
+  cygwin_conv_to_full_posix_path (w32, posix_fn);
   return posix_fn;
 }