* autoload.cc (LoadDLLprime): Change dllname storage to string16.

	(struct dll_info): Convert name to WCHAR.
	(std_dll_init): Load DLLs with full path to windows system directory.
	Add hint to Microsoft security advisory.
	* dcrt0.cc (init_windows_system_directory): New function.
	(dll_crt0_0): Call init_windows_system_directory first.
	* exceptions.cc (windows_system_directory): Move to globals.cc.
	(windows_system_directory_length): Ditto.
	(events_init): Drop code fetching windows_system_directory.
	* globals.cc (windows_system_directory): New global variable.
	(windows_system_directory_length): Ditto.
	* net.cc (load_ipv6_funcs): Use windows_system_directory rather than
	GetSystemDirectoryW.
	* netdb.cc (open_system_file): Ditto.  Simplify debug output.

1 files changed, 4 insertions, 6 deletions

diff --git a/winsup/cygwin/netdb.cc b/winsup/cygwin/netdb.cc
index bf03d1f56..3ac3d25eb 100644
--- a/winsup/cygwin/netdb.cc
+++ b/winsup/cygwin/netdb.cc
@@ -1,6 +1,6 @@
 /* netdb.cc: network database related routines.
 
-   Copyright 2002, 2003, 2007 Red Hat, Inc.
+   Copyright 2002, 2003, 2007, 2010 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -27,13 +27,11 @@ open_system_file (const char *relative_path)
   /* system dir path is never longer. */
   char win32_name[MAX_PATH];
 
-  if (!GetSystemDirectory (win32_name, MAX_PATH))
-    return NULL;
-  strcat (win32_name, "\\drivers\\etc\\");
+  sys_wcstombs (win32_name, MAX_PATH, windows_system_directory);
+  strcat (win32_name, "drivers\\etc\\");
   strcat (win32_name, relative_path);
-  debug_printf ("netdb file to open %s", win32_name);
   FILE *result = fopen (win32_name, "rt");
-  debug_printf ("handle to netdb file %p", result);
+  debug_printf ("handle to netdb file %s: %p", win32_name, result);
   return result;
 }