* devices.in (dev_cygdrive_storage): Revert mapping to \Device\Null.

	(dev_storage): Ditto for /dev.
	* devices.cc: Regenerate.
	* fhandler.cc (fhandler_base::open_null): New method to open a fake
	\Device\Null handler.
	(fhandler_base::open): Fix formatting.  Change O_ACCMODE test to a
	switch statement.  Simplify a test which still tested for a now unused
	create_disposition.
	* fhandler.h (fhandler_base::open_null): Declare.
	(fhandler_netdrive::close): Declare.
	* fhandler_dev.cc (fhandler_dev::open): Open fake \Device\Null handle
	by just calling new open_null method.
	* fhandler_disk_file.cc (fhandler_cygdrive::open): Ditto.
	* fhandler_netdrive.cc (fhandler_netdrive::open): Call open_null
	rather than setting nohandle.
	(fhandler_netdrive::close): New method.
	* fhandler_registry.cc (fetch_hkey): Fix token in RegOpenUserClassesRoot
	call.  Create valid key for HKEY_CURRENT_CONFIG by mapping to real key
	HKEY_LOCAL_MACHINE\System\CurrentControlSet\Hardware Profiles\Current.
	(fhandler_registry::open): Set nohandle only when using pseudo registry
	handle.
	* fhandler_virtual.cc (fhandler_virtual::opendir): Call open rather
	than just setting nohandle here.
	* fhandler_virtual::fstatvfs): Set ST_RDONLY fs flag.
	* globals.cc (ro_u_null): New readonly UNICODE_STRING for \Device\Null.
	* path.h (path_conv::set_path): Revert previous change caring for
	wide_path.

1 files changed, 2 insertions, 10 deletions

diff --git a/winsup/cygwin/fhandler_dev.cc b/winsup/cygwin/fhandler_dev.cc
index 668d0b480..4f92a1db8 100644
--- a/winsup/cygwin/fhandler_dev.cc
+++ b/winsup/cygwin/fhandler_dev.cc
@@ -16,7 +16,6 @@ details. */
 #include "dtable.h"
 #include "cygheap.h"
 #include "devices.h"
-#include "tls_pbuf.h"
 
 #define _COMPILING_NEWLIB
 #include <dirent.h>
@@ -54,16 +53,9 @@ fhandler_dev::open (int flags, mode_t mode)
   int ret = fhandler_disk_file::open (flags & ~O_CREAT, mode);
   if (!ret)
     {
+      /* Open a fake handle to \\Device\\Null */
+      ret = open_null (flags);
       dir_exists = false;
-      /* Open a fake handle to \\Device\\Null, but revert to the old path
-	 string afterwards, otherwise readdir will return with an EFAULT
-	 when trying to fetch the inode number of ".." */
-      tmp_pathbuf tp;
-      char *orig_path = tp.c_get ();
-      stpcpy (orig_path, get_win32_name ());
-      pc.set_path (dev ().native);
-      ret = fhandler_base::open (flags, mode);
-      pc.set_path (orig_path);
     }
   return ret;
 }