JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* mount.cc (mount_already_exists): Slightly rearrange.

Browse Source 
Change message texts.
This commit is contained in:
Corinna Vinschen
2000-07-13 21:49:36 +00:00
parent 91a8d90bab
commit 44d2afed74
2 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@@ -1,3 +1,8 @@
Thu Jul 13 22:24:00 2000 Corinna Vinschen <corinna@vinschen.de>
* mount.cc (mount_already_exists): Slightly rearrange.
Change message texts.
Thu Jul 13 13:02:00 2000 Corinna Vinschen <corinna@vinschen.de> Thu Jul 13 13:02:00 2000 Corinna Vinschen <corinna@vinschen.de>
* mount.cc (mount_already_exists): Additional warning message * mount.cc (mount_already_exists): Additional warning message

36
winsup/utils/mount.cc
View File

@@ -77,7 +77,7 @@ do_mount (const char *dev, const char *where, int flags)
else if (!(statbuf.st_mode & S_IFDIR)) else if (!(statbuf.st_mode & S_IFDIR))
{ {
if (force == FALSE) if (force == FALSE)
fprintf (stderr, "%s: warning: %s is not a directory!\n", progname, where); fprintf (stderr, "%s: warning: %s is not a directory.\n", progname, where);
} }
exit (0); exit (0);
@@ -207,25 +207,31 @@ mount_already_exists (const char *posix_path, int flags)
/* if the paths match, and they're both the same type of mount. */ /* if the paths match, and they're both the same type of mount. */
if (strcmp (p->mnt_dir, posix_path) == 0) if (strcmp (p->mnt_dir, posix_path) == 0)
{ {
if (p->mnt_type[0] == 'u' && !(flags & MOUNT_SYSTEM)) /* both current_user */ if (p->mnt_type[0] == 'u')
{ {
found_matching = 1; if (!(flags & MOUNT_SYSTEM)) /* both current_user */
break; found_matching = 1;
} else
else if (p->mnt_type[0] == 's' && (flags & MOUNT_SYSTEM)) /* both system */ fprintf (stderr,
{ "%s: warning: system mount point of '%s' "
found_matching = 1; "will always be masked by user mount.\n",
break; progname, posix_path);
}
else if (strchr ("su", p->mnt_type[0]))
{
fprintf (stderr, "%s: warning -- there's already a %s mount point to '%s'.\n", progname, p->mnt_type, posix_path);
fprintf (stderr, "%*s (user mount points cover system mount points!)\n", strlen (progname), " ");
break; break;
} }
else if (p->mnt_type[0] == 's')
{
if (flags & MOUNT_SYSTEM) /* both system */
found_matching = 1;
else
fprintf (stderr,
"%s: warning: user mount point of '%s' "
"masks system mount.\n",
progname, posix_path);
break;
}
else else
{ {
fprintf (stderr, "%s: warning -- couldn't determine mount type.\n", progname); fprintf (stderr, "%s: warning: couldn't determine mount type.\n", progname);
break; break;
} }
} }