diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-10-31 14:26:42 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-10-31 14:26:42 +0000 |
| commit | 5b312b4747cc4acda39c187369c02fcea456513b (patch) | |
| tree | 56d9e0bec1c4b808933153d0a38903805bb0cc88 /winsup/cygwin/devices.cc | |
| parent | a5f316d8cfbd9f2abf018e3fe766a88820492ac1 (diff) | |
| download | cygnal-5b312b4747cc4acda39c187369c02fcea456513b.tar.gz cygnal-5b312b4747cc4acda39c187369c02fcea456513b.tar.bz2 cygnal-5b312b4747cc4acda39c187369c02fcea456513b.zip | |
* 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.
Diffstat (limited to 'winsup/cygwin/devices.cc')
| -rw-r--r-- | winsup/cygwin/devices.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/devices.cc b/winsup/cygwin/devices.cc index cd49d4959..8aba6d840 100644 --- a/winsup/cygwin/devices.cc +++ b/winsup/cygwin/devices.cc @@ -91,7 +91,7 @@ exists_pty (const device& dev) } const device dev_cygdrive_storage = - {"/cygdrive", {FH_CYGDRIVE}, "\\Device\\Null", exists}; + {"/cygdrive", {FH_CYGDRIVE}, "", exists}; const device dev_fs_storage = {"", {FH_FS}, "", exists}; @@ -141,7 +141,7 @@ const device dev_error_storage = #define BRACK(x) {devn_int: x} const _RDATA device dev_storage[] = { - {"/dev", BRACK(FH_DEV), "\\Device\\Null", exists, S_IFDIR, false}, + {"/dev", BRACK(FH_DEV), "", exists, S_IFDIR, false}, {"/dev/clipboard", BRACK(FH_CLIPBOARD), "\\Device\\Null", exists_ntdev, S_IFCHR, true}, {"/dev/com1", BRACK(FHDEV(DEV_SERIAL_MAJOR, 0)), "\\??\\COM1", exists_ntdev_silent, S_IFCHR, true}, {"/dev/com2", BRACK(FHDEV(DEV_SERIAL_MAJOR, 1)), "\\??\\COM2", exists_ntdev_silent, S_IFCHR, true}, |