PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

* mount.cc (mount_commands): Ensure user mode is actually user mode and not the 

default system mode.
This commit is contained in:
Christopher Faylor 2003-09-04 01:04:57 +00:00
parent e550f4d980
commit e48feef96a
2 changed files with 47 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@ -1,3 +1,8 @@
2003-09-01 AJ Reins <reinsaj@yahoo.com>
* mount.cc (mount_commands): Ensure user mode is actually user mode and
not the default system mode.
2003-08-31 Christopher Faylor <cgf@redhat.com>
* kill.cc (forcekill): Silence some compiler warnings.

78
winsup/utils/mount.cc
View File

@ -406,48 +406,54 @@ mount_commands (void)
char system_flags[MAX_PATH];
// write mount commands for user and system mount points
while ((p = getmntent (m)) != NULL) {
while ((p = getmntent (m)) != NULL)
// Only list non-cygdrives
if (!strstr (p->mnt_opts, ",noumount")) {
strcpy(opts, " -f");
if (p->mnt_type[0] == 'u')
strcat (opts, " -u");
else if (p->mnt_type[0] == 's')
strcat (opts, " -s");
if (p->mnt_opts[0] == 'b')
strcat (opts, " -b");
else if (p->mnt_opts[0] == 't')
strcat (opts, " -t");
if (strstr (p->mnt_opts, ",exec"))
strcat (opts, " -x");
if (strstr (p->mnt_opts, ",noexec"))
strcat (opts, " -E");
while ((c = strchr (p->mnt_fsname, '\\')) != NULL)
*c = '/';
printf (format_mnt, opts, p->mnt_fsname, p->mnt_dir);
}
}
if (!strstr (p->mnt_opts, ",noumount"))
{
strcpy(opts, " -f");
if (p->mnt_type[0] == 'u')
strcat (opts, " -u");
else if (p->mnt_type[0] == 's')
strcat (opts, " -s");
if (p->mnt_opts[0] == 'b')
strcat (opts, " -b");
else if (p->mnt_opts[0] == 't')
strcat (opts, " -t");
if (strstr (p->mnt_opts, ",exec"))
strcat (opts, " -x");
if (strstr (p->mnt_opts, ",noexec"))
strcat (opts, " -E");
if (strstr (p->mnt_opts, ",managed"))
strcat (opts, " -o managed");
while ((c = strchr (p->mnt_fsname, '\\')) != NULL)
*c = '/';
printf (format_mnt, opts, p->mnt_fsname, p->mnt_dir);
}
endmntent (m);
// write mount commands for cygdrive prefixes
cygwin_internal (CW_GET_CYGDRIVE_INFO, user, system, user_flags,
system_flags);
if (strlen (user) > 0) {
strcpy (opts, " ");
if (user_flags[0] == 'b')
strcat (opts, " -b");
else if (user_flags[0] == 't')
strcat (opts, " -t");
printf (format_cyg, opts, user);
}
if (strlen (system) > 0) {
strcpy (opts, " -s");
if (system_flags[0] == 'b')
strcat (opts, " -b");
else if (system_flags[0] == 't')
strcat (opts, " -t");
printf (format_cyg, opts, system);
}
if (strlen (user) > 0)
{
strcpy (opts, " -u");
if (user_flags[0] == 'b')
strcat (opts, " -b");
else if (user_flags[0] == 't')
strcat (opts, " -t");
printf (format_cyg, opts, user);
}
if (strlen (system) > 0)
{
strcpy (opts, " -s");
if (system_flags[0] == 'b')
strcat (opts, " -b");
else if (system_flags[0] == 't')
strcat (opts, " -t");
printf (format_cyg, opts, system);
}
exit(0);
}