diff options
author | Christopher Faylor <me@cgf.cx> | 2001-04-16 06:51:03 +0400 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2001-04-16 06:51:03 +0400 |
commit | 9f42525632f6edb1ff93fba5a724b927dd983a19 (patch) | |
tree | 06cdd38e31bf0988a784bb96c3c64443d216dde0 /winsup | |
parent | 4535e6a9aa80c40dfebd345e1e53b788a3047aad (diff) |
* mount.cc (longopts): Add help to options list.
(opts): Add 'h' to options string.
* umount.cc (longopts): Add help to options list.
(opts): Add 'h' to options string and change 'R' to 'A'.
Diffstat (limited to 'winsup')
-rw-r--r-- | winsup/utils/ChangeLog | 19 | ||||
-rw-r--r-- | winsup/utils/mount.cc | 37 | ||||
-rw-r--r-- | winsup/utils/umount.cc | 3 |
3 files changed, 34 insertions, 25 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index a3327ea87..2d0ce2b57 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,14 +1,21 @@ +2001-04-15 Michael A Chase <mchase@ix.netcom.com> + + * mount.cc (longopts): Add help to options list. + (opts): Add 'h' to options string. + * umount.cc (longopts): Add help to options list. + (opts): Add 'h' to options string and change 'R' to 'A'. + 2001-04-13 Kazuhiro Fujieda <fujieda@jaist.ac.jp> * mkgroup.c (enum_groups): Use RID + offset specified an additional argument as ID. (usage): Add description of -o option. (longopts, opts): Add specifications of -o/--id-offset option. - (main): Add -o option. Invoke enum_groups with specified offset. + (main): Add -o option. Invoke enum_groups with specified offset. * mkpasswd.c (enum_users): Just like mkgroup.c. (usage, longopts, opts): Ditto. - (main): Add -o option. Invoke enum_users with specified offset - only against domain accounts. + (main): Add -o option. Invoke enum_users with specified offset only + against domain accounts. 2001-04-11 Egor Duda <deo@logos-m.ru> @@ -38,9 +45,9 @@ Sat Mar 17 21:46:06 2001 Christopher Faylor <cgf@cygnus.com> Mon Mar 5 18:50:00 2001 Corinna Vinschen <vinschen@redhat.com> - * getfacl.c: Add copyright hint. - * setfacl.c: Ditto. - * strace.cc: Ditto. + * getfacl.c: Add copyright hint. + * setfacl.c: Ditto. + * strace.cc: Ditto. Tue Jan 09 10:26:23 2001 Tony Sideris <tonys1110@home.com> diff --git a/winsup/utils/mount.cc b/winsup/utils/mount.cc index c9ec96dae..b82501233 100644 --- a/winsup/utils/mount.cc +++ b/winsup/utils/mount.cc @@ -87,6 +87,7 @@ do_mount (const char *dev, const char *where, int flags) struct option longopts[] = { + {"help", no_argument, NULL, 'h' }, {"binary", no_argument, NULL, 'b'}, {"force", no_argument, NULL, 'f'}, {"system", no_argument, NULL, 's'}, @@ -100,7 +101,7 @@ struct option longopts[] = {NULL, 0, NULL, 0} }; -char opts[] = "bfstuxXpic"; +char opts[] = "hbfstuxXpic"; static void usage (void) @@ -110,7 +111,7 @@ usage (void) (newline = \\n)\n\ -c, --change-cygdrive-prefix change the cygdrive path prefix to <posixpath>\n\ -f, --force force mount, don't warn about missing mount\n\ - point directories\n\ + point directories\n\ -i, --import-old-mounts copy old registry mount table mounts into the current\n\ mount areas\n\ -p, --show-cygdrive-prefix show user and/or system cygdrive path prefix\n\ @@ -151,7 +152,7 @@ main (int argc, char **argv) case 'b': flags |= MOUNT_BINARY; break; - case 'c': + case 'c': if (do_what == nada) do_what = saw_change_cygdrive_prefix; else @@ -259,24 +260,24 @@ mount_already_exists (const char *posix_path, int flags) { if (p->mnt_type[0] == 'u') { - 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); + 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') { - 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); + 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 diff --git a/winsup/utils/umount.cc b/winsup/utils/umount.cc index 607241162..3adb8511e 100644 --- a/winsup/utils/umount.cc +++ b/winsup/utils/umount.cc @@ -25,6 +25,7 @@ static const char *progname; struct option longopts[] = { + {"help", no_argument, NULL, 'h' }, {"remove-all-mounts", no_argument, NULL, 'A'}, {"remove-cygdrive-prefix", no_argument, NULL, 'c'}, {"remove-system-mounts", no_argument, NULL, 'S'}, @@ -34,7 +35,7 @@ struct option longopts[] = {NULL, 0, NULL, 0} }; -char opts[] = "RSUsuc"; +char opts[] = "hASUsuc"; static void usage (void) |