From 520fcc974702602a1a3b246346e726492bad52e6 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Thu, 24 Jul 2008 18:25:52 +0000
Subject: 	* shared.cc (user_shared_initialize): Fetch potentially
 changed Cygwin 	username from /etc/passwd before loading mount table. 
 (shared_info::init_installation_root): New function fetching Cygwin's 
 installation root dir and storing as native NT path in global shared 
 memory. 	(shared_info::initialize): Call init_installation_root exactly
 once at 	first startup. 	* shared_info.h (SHARED_INFO_CB): Accommodate
 change to shared_info. 	(CURR_SHARED_MAGIC): Ditto. 	(class
 shared_info): Add installation_root member. 
 (shared_info::init_installation_root): Declare.

	* grp.cc (pwdgrp::read_group): Call pwdgrp::load with native WCHAR path.
	* passwd.cc (pwdgrp::read_passwd): Ditto.  Avoid recursion.
	(etc::init): Take POBJECT_ATTRIBUTES instead of path_conv.
	* path.h (etc::init): Change prototype accordingly.
	* pwdgrp.h (class pwdgrp): Store path as UNICODE_STRING/PWCHAR instead
	of as path_conv.
	(pwdgrp::load): Accommodate prototype.
	* uinfo.cc (pwdgrp::load): Change argument type from char to wchar_t.
	Create native NT path here instead of calling path_conv.

	* mount.cc (find_root_from_cygwin_dll): Drop in favor of global
	initializaion in shared_info.
	(mount_info::init): Fetch native NT root dir from cygwin_shared.
	(mount_info::from_fstab): Expect native NT path and use native NT
	functions to access file.  Convert username part in user fstab path
	according to special char transformation rules.
	* path.cc (tfx_chars): Convert slash to backslash.
	(transform_chars): Implement for path given as PWCHAR.
	(transform_chars): PUNICODE_STRING version calls PWCHAR version.
	Remove useless commented code.
---
 winsup/cygwin/path.cc | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

(limited to 'winsup/cygwin/path.cc')

diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index d550203ea..ae105491d 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -574,7 +574,7 @@ WCHAR tfx_chars[] NO_COPY = {
   16,  17,  18,  19,  20,  21,  22,  23,
   24,  25,  26,  27,  28,  29,  30,  31,
   32, '!', 0xf000 | '"', '#', '$', '%', '&',  39,
-  '(', ')', 0xf000 | '*', '+', ',', '-', '.', '/',
+  '(', ')', 0xf000 | '*', '+', ',', '-', '.', '\\',
  '0', '1', '2', '3', '4', '5', '6', '7',
  '8', '9', 0xf000 | ':', ';', 0xf000 | '<', '=', 0xf000 | '>', 0xf000 | '?',
  '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
@@ -587,22 +587,20 @@ WCHAR tfx_chars[] NO_COPY = {
  'x', 'y', 'z', '{', 0xf000 | '|', '}', '~', 127
 };
 
-static void
+void
+transform_chars (PWCHAR path, PWCHAR path_end)
+{
+  for (; path <= path_end; ++path)
+    if (*path < 128)
+      *path = tfx_chars[*path];
+}
+
+static inline
+void
 transform_chars (PUNICODE_STRING upath, USHORT start_idx)
 {
-  register PWCHAR buf = upath->Buffer;
-  register PWCHAR end = buf + upath->Length / sizeof (WCHAR) - 1;
-  for (buf += start_idx; buf <= end; ++buf)
-    if (*buf < 128)
-      *buf = tfx_chars[*buf];
-#if 0
-  /* Win32 can't handle trailing dots and spaces.  Transform the last of them
-     to the private use area, too, to create a valid Win32 filename. */
-  if (*end == L'\\')
-    --end;
-  if (*end == L'.' || *end == L' ')
-    *end |= 0xf000;
-#endif
+  transform_chars (upath->Buffer + start_idx,
+		   upath->Buffer + upath->Length / sizeof (WCHAR) - 1);
 }
 
 PUNICODE_STRING
@@ -3391,7 +3389,7 @@ OBJECT_ATTRIBUTES etc::fn[MAX_ETC_FILES + 1];
 LARGE_INTEGER etc::last_modified[MAX_ETC_FILES + 1];
 
 int
-etc::init (int n, path_conv &pc)
+etc::init (int n, POBJECT_ATTRIBUTES attr)
 {
   if (n > 0)
     /* ok */;
@@ -3400,7 +3398,7 @@ etc::init (int n, path_conv &pc)
   else
     api_fatal ("internal error");
 
-  pc.get_object_attr (fn[n], sec_none_nih);
+  fn[n] = *attr;
   change_possible[n] = false;
   test_file_change (n);
   paranoid_printf ("fn[%d] %S, curr_ix %d", n, fn[n].ObjectName, curr_ix);
-- 
cgit v1.2.3