diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2000-07-14 01:49:36 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2000-07-14 01:49:36 +0400 |
| commit | 44d2afed74351bafed8c4f4d4e5664e50a9c9a9c (patch) | |
| tree | 4c6db243ca2780c66b8858340fd7c19cd1c04959 | |
| parent | 91a8d90babddd48b5ce982eaddeff0c94640d7c8 (diff) | |
* mount.cc (mount_already_exists): Slightly rearrange.
Change message texts.
| -rw-r--r-- | winsup/utils/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/utils/mount.cc | 32 |
2 files changed, 24 insertions, 13 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 29a83f243..ae646b843 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -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> * mount.cc (mount_already_exists): Additional warning message diff --git a/winsup/utils/mount.cc b/winsup/utils/mount.cc index 6a981cfcd..d7f657c9c 100644 --- a/winsup/utils/mount.cc +++ b/winsup/utils/mount.cc @@ -77,7 +77,7 @@ do_mount (const char *dev, const char *where, int flags) else if (!(statbuf.st_mode & S_IFDIR)) { 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); @@ -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 (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 */ + found_matching = 1; + else + fprintf (stderr, + "%s: warning: system mount point of '%s' " + "will always be masked by user mount.\n", + progname, posix_path); break; - } - else if (p->mnt_type[0] == 's' && (flags & MOUNT_SYSTEM)) /* both system */ + } + else if (p->mnt_type[0] == 's') { - found_matching = 1; + 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 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; - } else { - fprintf (stderr, "%s: warning -- couldn't determine mount type.\n", progname); + fprintf (stderr, "%s: warning: couldn't determine mount type.\n", progname); break; } } |