summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/mount.cc
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2014-11-27 16:49:41 +0000
committerCorinna Vinschen <corinna@vinschen.de>2014-11-27 16:49:41 +0000
commite7d7418270fd17998e09017f013816788b32651d (patch)
tree4615fa9e3fd977828a3211a927bcba832475e021 /winsup/cygwin/mount.cc
parentdb880b56427272aaea287a42541fe127dc5590a6 (diff)
downloadcygnal-e7d7418270fd17998e09017f013816788b32651d.tar.gz
cygnal-e7d7418270fd17998e09017f013816788b32651d.tar.bz2
cygnal-e7d7418270fd17998e09017f013816788b32651d.zip
* mount.cc (mount_info::init): Take bool argument and allow to
initialize mount table in two steps, system and user, depending on bool value. * mount.h (class mount_info): Align declaration of init function to above change. * shared.cc (user_info::initialize): Initialize mount table in two steps to allow internal_getpwsid to create valid POSIX paths from DOS paths given in AD. Add comments. * uinfo.cc (cygheap_pwdgrp::get_home): Allow DOS paths in NSS_SCHEME_FREEATTR attributes. (cygheap_pwdgrp::get_shell): Ditto.
Diffstat (limited to 'winsup/cygwin/mount.cc')
-rw-r--r--winsup/cygwin/mount.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc
index 94e305489..6cf3ddf46 100644
--- a/winsup/cygwin/mount.cc
+++ b/winsup/cygwin/mount.cc
@@ -468,19 +468,19 @@ mount_info::create_root_entry (const PWCHAR root)
/* init: Initialize the mount table. */
void
-mount_info::init ()
+mount_info::init (bool user_init)
{
PWCHAR pathend;
WCHAR path[PATH_MAX];
pathend = wcpcpy (path, cygheap->installation_root);
- create_root_entry (path);
- pathend = wcpcpy (pathend, L"\\etc\\fstab");
+ if (!user_init)
+ create_root_entry (path);
- from_fstab (false, path, pathend);
- from_fstab (true, path, pathend);
+ pathend = wcpcpy (pathend, L"\\etc\\fstab");
+ from_fstab (user_init, path, pathend);
- if (!got_usr_bin || !got_usr_lib)
+ if (!user_init && (!got_usr_bin || !got_usr_lib))
{
char native[PATH_MAX];
if (root_idx < 0)