diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2008-07-24 18:25:52 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2008-07-24 18:25:52 +0000 |
| commit | 520fcc974702602a1a3b246346e726492bad52e6 (patch) | |
| tree | d57b580ba4493d8f1e886548044b4771544905fd /winsup/cygwin/passwd.cc | |
| parent | 410c1d122d8c65b747d55138f00d32d5c1b607bc (diff) | |
| download | cygnal-520fcc974702602a1a3b246346e726492bad52e6.tar.gz cygnal-520fcc974702602a1a3b246346e726492bad52e6.tar.bz2 cygnal-520fcc974702602a1a3b246346e726492bad52e6.zip | |
* 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.
Diffstat (limited to 'winsup/cygwin/passwd.cc')
| -rw-r--r-- | winsup/cygwin/passwd.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/winsup/cygwin/passwd.cc b/winsup/cygwin/passwd.cc index 14d0cee5c..1773de507 100644 --- a/winsup/cygwin/passwd.cc +++ b/winsup/cygwin/passwd.cc @@ -51,7 +51,7 @@ pwdgrp::parse_passwd () void pwdgrp::read_passwd () { - load ("/etc/passwd"); + load (L"\\etc\\passwd"); char strbuf[128] = ""; bool searchentry = true; @@ -72,7 +72,6 @@ pwdgrp::read_passwd () { static char linebuf[1024]; // must be static and // should not be NO_COPY - cygheap->user.ontherange (CH_HOME, NULL); snprintf (linebuf, sizeof (linebuf), "%s:*:%lu:%lu:,%s:%s:/bin/sh", cygheap->user.name (), myself->uid == ILLEGAL_UID ? UNKNOWN_UID : myself->uid, |