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

* mount.cc (longopts): Add help to options list.

Browse Source 
(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'.
This commit is contained in:
Christopher Faylor
2001-04-16 02:51:03 +00:00
parent 4535e6a9aa
commit 9f42525632
3 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
winsup/utils/ChangeLog
View File

@@ -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> 2001-04-13 Kazuhiro Fujieda <fujieda@jaist.ac.jp>
* mkgroup.c (enum_groups): Use RID + offset specified an additional * mkgroup.c (enum_groups): Use RID + offset specified an additional
argument as ID. argument as ID.
(usage): Add description of -o option. (usage): Add description of -o option.
(longopts, opts): Add specifications of -o/--id-offset 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. * mkpasswd.c (enum_users): Just like mkgroup.c.
(usage, longopts, opts): Ditto. (usage, longopts, opts): Ditto.
(main): Add -o option. Invoke enum_users with specified offset (main): Add -o option. Invoke enum_users with specified offset only
only against domain accounts. against domain accounts.
2001-04-11 Egor Duda <deo@logos-m.ru> 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> Mon Mar 5 18:50:00 2001 Corinna Vinschen <vinschen@redhat.com>
* getfacl.c: Add copyright hint. * getfacl.c: Add copyright hint.
* setfacl.c: Ditto. * setfacl.c: Ditto.
* strace.cc: Ditto. * strace.cc: Ditto.
Tue Jan 09 10:26:23 2001 Tony Sideris <tonys1110@home.com> Tue Jan 09 10:26:23 2001 Tony Sideris <tonys1110@home.com>

35
winsup/utils/mount.cc
View File

@@ -87,6 +87,7 @@ do_mount (const char *dev, const char *where, int flags)
struct option longopts[] = struct option longopts[] =
{ {
{"help", no_argument, NULL, 'h' },
{"binary", no_argument, NULL, 'b'}, {"binary", no_argument, NULL, 'b'},
{"force", no_argument, NULL, 'f'}, {"force", no_argument, NULL, 'f'},
{"system", no_argument, NULL, 's'}, {"system", no_argument, NULL, 's'},
@@ -100,7 +101,7 @@ struct option longopts[] =
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };
char opts[] = "bfstuxXpic"; char opts[] = "hbfstuxXpic";
static void static void
usage (void) usage (void)
@@ -110,7 +111,7 @@ usage (void)
(newline = \\n)\n\ (newline = \\n)\n\
-c, --change-cygdrive-prefix change the cygdrive path prefix to <posixpath>\n\ -c, --change-cygdrive-prefix change the cygdrive path prefix to <posixpath>\n\
-f, --force force mount, don't warn about missing mount\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\ -i, --import-old-mounts copy old registry mount table mounts into the current\n\
mount areas\n\ mount areas\n\
-p, --show-cygdrive-prefix show user and/or system cygdrive path prefix\n\ -p, --show-cygdrive-prefix show user and/or system cygdrive path prefix\n\
@@ -259,24 +260,24 @@ mount_already_exists (const char *posix_path, int flags)
{ {
if (p->mnt_type[0] == 'u') if (p->mnt_type[0] == 'u')
{ {
if (!(flags & MOUNT_SYSTEM)) /* both current_user */ if (!(flags & MOUNT_SYSTEM)) /* both current_user */
found_matching = 1; found_matching = 1;
else else
fprintf (stderr, fprintf (stderr,
"%s: warning: system mount point of '%s' " "%s: warning: system mount point of '%s' "
"will always be masked by user mount.\n", "will always be masked by user mount.\n",
progname, posix_path); progname, posix_path);
break; break;
} }
else if (p->mnt_type[0] == 's') else if (p->mnt_type[0] == 's')
{ {
if (flags & MOUNT_SYSTEM) /* both system */ if (flags & MOUNT_SYSTEM) /* both system */
found_matching = 1; found_matching = 1;
else else
fprintf (stderr, fprintf (stderr,
"%s: warning: user mount point of '%s' " "%s: warning: user mount point of '%s' "
"masks system mount.\n", "masks system mount.\n",
progname, posix_path); progname, posix_path);
break; break;
} }
else else

3
winsup/utils/umount.cc
View File

@@ -25,6 +25,7 @@ static const char *progname;
struct option longopts[] = struct option longopts[] =
{ {
{"help", no_argument, NULL, 'h' },
{"remove-all-mounts", no_argument, NULL, 'A'}, {"remove-all-mounts", no_argument, NULL, 'A'},
{"remove-cygdrive-prefix", no_argument, NULL, 'c'}, {"remove-cygdrive-prefix", no_argument, NULL, 'c'},
{"remove-system-mounts", no_argument, NULL, 'S'}, {"remove-system-mounts", no_argument, NULL, 'S'},
@@ -34,7 +35,7 @@ struct option longopts[] =
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };
char opts[] = "RSUsuc"; char opts[] = "hASUsuc";
static void static void
usage (void) usage (void)