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

* mount.cc (opts): Remove '-i' option.

Browse Source 
(usage): Ditto.
(main): Ditto.
(longopts): Remove --import-old-mounts option.
This commit is contained in:
Christopher Faylor 2002-06-09 00:33:27 +00:00
parent 50484e8e36
commit 60a3d46123
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/utils/ChangeLog
View File

@ -1,3 +1,10 @@
2002-06-08 Christopher Faylor <cgf@redhat.com>
* mount.cc (opts): Remove '-i' option.
(usage): Ditto.
(main): Ditto.
(longopts): Remove --import-old-mounts option.
2002-06-07 David Peterson <chief@mail.idrive.com> 2002-06-07 David Peterson <chief@mail.idrive.com>
Christopher Faylor <cgf@redhat.com> Christopher Faylor <cgf@redhat.com>

18
winsup/utils/mount.cc
View File

@ -118,7 +118,6 @@ static struct option longopts[] =
{"executable", no_argument, NULL, 'x'}, {"executable", no_argument, NULL, 'x'},
{"force", no_argument, NULL, 'f'}, {"force", no_argument, NULL, 'f'},
{"help", no_argument, NULL, 'h' }, {"help", no_argument, NULL, 'h' },
{"import-old-mounts", no_argument, NULL, 'i'},
{"mount-commands", no_argument, NULL, 'm'}, {"mount-commands", no_argument, NULL, 'm'},
{"no-executable", no_argument, NULL, 'E'}, {"no-executable", no_argument, NULL, 'E'},
{"show-cygdrive-prefix", no_argument, NULL, 'p'}, {"show-cygdrive-prefix", no_argument, NULL, 'p'},
@ -129,7 +128,7 @@ static struct option longopts[] =
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };
static char opts[] = "bcfhimpstuvxEX"; static char opts[] = "bcfhmpstuvxEX";
static void static void
usage (FILE *where = stderr) usage (FILE *where = stderr)
@ -141,8 +140,6 @@ usage (FILE *where = stderr)
-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\
-h, --help output usage information and exit\n\ -h, --help output usage information and exit\n\
-i, --import-old-mounts copy old registry mount table mounts into the\n\
current mount areas\n\
-m, --mount-commands write mount commands to replace user and\n\ -m, --mount-commands write mount commands to replace user and\n\
system mount points and cygdrive prefixes\n\ system mount points and cygdrive prefixes\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\
@ -191,7 +188,6 @@ main (int argc, char **argv)
{ {
nada, nada,
saw_change_cygdrive_prefix, saw_change_cygdrive_prefix,
saw_import_old_mounts,
saw_show_cygdrive_prefix, saw_show_cygdrive_prefix,
saw_mount_commands saw_mount_commands
} do_what = nada; } do_what = nada;
@ -228,12 +224,6 @@ main (int argc, char **argv)
case 'h': case 'h':
usage (stdout); usage (stdout);
break; break;
case 'i':
if (do_what == nada)
do_what = saw_import_old_mounts;
else
usage ();
break;
case 'm': case 'm':
if (do_what == nada) if (do_what == nada)
do_what = saw_mount_commands; do_what = saw_mount_commands;
@ -287,12 +277,6 @@ main (int argc, char **argv)
usage (); usage ();
change_cygdrive_prefix (argv[optind], flags); change_cygdrive_prefix (argv[optind], flags);
break; break;
case saw_import_old_mounts:
if (optind <= argc)
usage ();
else
cygwin_internal (CW_READ_V1_MOUNT_TABLES);
break;
case saw_show_cygdrive_prefix: case saw_show_cygdrive_prefix:
if (optind <= argc) if (optind <= argc)
usage (); usage ();