From 2849cbde549bbc9e66c6b409ee60e47880b11490 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 5 May 2011 06:45:21 +0000 Subject: [PATCH] * fhandler_registry.cc (fhandler_registry::exists): Fix regression in EACCES handling. (fhandler_registry::open): Fix "%val" case. --- winsup/cygwin/ChangeLog | 6 ++++++ winsup/cygwin/fhandler_registry.cc | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 7daf6051e..2c78ca52c 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2011-05-04 Christian Franke + + * fhandler_registry.cc (fhandler_registry::exists): Fix regression + in EACCES handling. + (fhandler_registry::open): Fix "%val" case. + 2011-05-04 Christopher Faylor * signal.cc (_pinfo::kill): Return success on kill(0) only if pid diff --git a/winsup/cygwin/fhandler_registry.cc b/winsup/cygwin/fhandler_registry.cc index f2e80ce11..8d3ed2e72 100644 --- a/winsup/cygwin/fhandler_registry.cc +++ b/winsup/cygwin/fhandler_registry.cc @@ -317,10 +317,12 @@ fhandler_registry::exists () if (!val_only) hKey = open_key (path, KEY_READ, wow64, false); - if (hKey != (HKEY) INVALID_HANDLE_VALUE || get_errno () == EACCES) + if (hKey != (HKEY) INVALID_HANDLE_VALUE) file_type = virt_directory; else { + /* Key does not exist or open failed with EACCES, + enumerate subkey and value names of parent key. */ hKey = open_key (path, KEY_READ, wow64, true); if (hKey == (HKEY) INVALID_HANDLE_VALUE) return virt_none; @@ -797,7 +799,7 @@ fhandler_registry::open (int flags, mode_t mode) handle = open_key (path, KEY_READ, wow64, false); if (handle == (HKEY) INVALID_HANDLE_VALUE) { - if (get_errno () != EACCES) + if (val_only || get_errno () != EACCES) handle = open_key (path, KEY_READ, wow64, true); if (handle == (HKEY) INVALID_HANDLE_VALUE) { -- 2.43.5