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

* mount.cc (main): Use getopt_long for parsing arguments.

Browse Source 
(usage): Reformat, show long and short options.
* umount.cc (main): Ditto, all of the above.
This commit is contained in:
Christopher Faylor 2001-04-03 02:41:54 +00:00
parent c6cd25a033
commit be61cf4d0c
3 changed files with 211 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/utils/ChangeLog
View File

@ -1,3 +1,9 @@
Mon Apr 2 22:41:33 2001 Christopher Faylor <cgf@cygnus.com>
* mount.cc (main): Use getopt_long for parsing arguments.
(usage): Reformat, show long and short options.
* umount.cc (main): Ditto, all of the above.
Mon Apr 2 10:58:26 2001 Christopher Faylor <cgf@cygnus.com> Mon Apr 2 10:58:26 2001 Christopher Faylor <cgf@cygnus.com>
* mount.cc (show_mounts): Change format string to more closely resemble * mount.cc (show_mounts): Change format string to more closely resemble

186
winsup/utils/mount.cc
View File

@ -15,6 +15,7 @@ details. */
#include <windows.h> #include <windows.h>
#include <sys/cygwin.h> #include <sys/cygwin.h>
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h>
#ifdef errno #ifdef errno
#undef errno #undef errno
@ -84,32 +85,57 @@ do_mount (const char *dev, const char *where, int flags)
exit (0); exit (0);
} }
struct option longopts[] =
{
{"binary", no_argument, NULL, 'b'},
{"force", no_argument, NULL, 'f'},
{"system", no_argument, NULL, 's'},
{"text", no_argument, NULL, 't'},
{"user", no_argument, NULL, 'u'},
{"executable", no_argument, NULL, 'x'},
{"change-cygdrive-prefix", no_argument, NULL, 'c'},
{"cygwin-executable", no_argument, NULL, 'X'},
{"show-cygdrive-prefix", no_argument, NULL, 'p'},
{"import-old-mounts", no_argument, NULL, 'i'},
{NULL, 0, NULL, 0}
};
char opts[] = "bfstuxXpic";
static void static void
usage (void) usage (void)
{ {
fprintf (stderr, "usage %s [-bfstux] <win32path> <posixpath> fprintf (stderr, "Usage: %s [OPTION] [<win32path> <posixpath>]\n\
-b text files are equivalent to binary files (newline = \\n) -b, --binary text files are equivalent to binary files\n\
-f force mount, don't warn about missing mount point directories (newline = \\n)\n\
-s add mount point to system-wide registry location -c, --change-cygdrive-prefix change the cygdrive path prefix to <posixpath>\n\
-t text files get \\r\\n line endings (default) -f, --force force mount, don't warn about missing mount\n\
-u add mount point to user registry location (default) point directories\n\
-x treat all files under mount point as executables -i, --import-old-mounts copy old registry mount table mounts into the current\n\
mount areas\n\
[-bs] --change-cygdrive-prefix <posixpath> -p, --show-cygdrive-prefix show user and/or system cygdrive path prefix\n\
change the cygdrive path prefix to <posixpath> -s, --system add mount point to system-wide registry location\n\
--show-cygdrive-prefixes -t, --text (default) text files get \\r\\n line endings\n\
show user and/or system cygdrive path prefixes -u, --user (default) add mount point to user registry location\n\
--import-old-mounts -x, --executable treat all files under mount point as executables\n\
copy old registry mount table mounts into the current mount areas -X, --cygwin-executable treat all files under mount point as cygwin\n\
executables\n\
", progname); ", progname);
exit (1); exit (1);
} }
int int
main (int argc, const char **argv) main (int argc, char **argv)
{ {
int i; int i;
int flags = 0; int flags = 0;
enum do_what
{
nada,
saw_change_cygdrive_prefix,
saw_import_old_mounts,
saw_show_cygdrive_prefix
} do_what = nada;
progname = argv[0]; progname = argv[0];
@ -119,65 +145,85 @@ main (int argc, const char **argv)
exit (0); exit (0);
} }
for (i = 1; i < argc; ++i) while ((i = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
{ switch (i)
if (argv[i][0] != '-') {
break; case 'b':
if (strcmp (argv[i], "--change-cygdrive-prefix") == 0)
{
if ((i + 2) != argc)
usage ();
change_cygdrive_prefix (argv[i+1], flags);
}
else if (strcmp (argv[i], "--import-old-mounts") == 0)
{
if ((i + 1) != argc)
usage ();
cygwin_internal (CW_READ_V1_MOUNT_TABLES);
exit (0);
}
else if (strcmp (argv[i], "--show-cygdrive-prefixes") == 0)
{
if ((i + 1) != argc)
usage ();
show_cygdrive_info ();
}
else if (strcmp (argv[i], "-b") == 0)
flags |= MOUNT_BINARY; flags |= MOUNT_BINARY;
else if (strcmp (argv[i], "-t") == 0) break;
flags &= ~MOUNT_BINARY; case 'c':
else if (strcmp (argv[i], "-X") == 0) if (do_what == nada)
flags |= MOUNT_CYGWIN_EXEC; do_what = saw_change_cygdrive_prefix;
#if 0 else
else if (strcmp (argv[i], "-x") == 0) usage ();
create_missing_dirs = TRUE; break;
#endif case 'f':
else if (strcmp (argv[i], "-s") == 0)
flags |= MOUNT_SYSTEM;
else if (strcmp (argv[i], "-u") == 0)
flags &= ~MOUNT_SYSTEM;
else if (strcmp (argv[i], "-x") == 0)
flags |= MOUNT_EXEC;
else if (strcmp (argv[i], "-f") == 0)
force = TRUE; force = TRUE;
else break;
case 'i':
if (do_what == nada)
do_what = saw_import_old_mounts;
else
usage ();
break;
case 'p':
if (do_what == nada)
do_what = saw_show_cygdrive_prefix;
else
usage ();
break;
case 's':
flags |= MOUNT_SYSTEM;
break;
case 't':
flags &= ~MOUNT_BINARY;
break;
case 'u':
flags &= ~MOUNT_SYSTEM;
break;
case 'X':
flags |= MOUNT_CYGWIN_EXEC;
break;
case 'x':
flags |= MOUNT_EXEC;
break;
default:
usage (); usage ();
} }
if ((i + 2) != argc) argc--;
usage (); switch (do_what)
if ((force == FALSE) && (mount_already_exists (argv[i + 1], flags)))
{ {
errno = EBUSY; case saw_change_cygdrive_prefix:
error (argv[i + 1]); if (optind != argc)
usage ();
change_cygdrive_prefix (argv[optind], flags);
break;
case saw_import_old_mounts:
if (optind <= argc)
usage ();
else
cygwin_internal (CW_READ_V1_MOUNT_TABLES);
break;
case saw_show_cygdrive_prefix:
if (optind <= argc)
usage ();
show_cygdrive_info ();
break;
default:
if (optind != (argc - 1))
{
fprintf (stderr, "%s: too many arguments\n", progname);
usage ();
}
if (force || !mount_already_exists (argv[optind + 1], flags))
do_mount (argv[optind], argv[optind + 1], flags);
else
{
errno = EBUSY;
error (argv[optind + 1]);
}
} }
else
do_mount (argv[i], argv[i + 1], flags);
/* NOTREACHED */ /* NOTREACHED */
return 0; return 0;
@ -257,7 +303,7 @@ change_cygdrive_prefix (const char *new_prefix, int flags)
exit (0); exit (0);
} }
/* show_cygdrive_info: Show the user and/or cygdrive info, i.e., prefixes and /* show_cygdrive_info: Show the user and/or cygdrive info, i.e., prefix and
flags.*/ flags.*/
static void static void
show_cygdrive_info () show_cygdrive_info ()
@ -270,7 +316,7 @@ show_cygdrive_info ()
cygwin_internal (CW_GET_CYGDRIVE_INFO, user, system, user_flags, cygwin_internal (CW_GET_CYGDRIVE_INFO, user, system, user_flags,
system_flags); system_flags);
/* Display the user and system cygdrive path prefixes, if necessary /* Display the user and system cygdrive path prefix, if necessary
(ie, not empty) */ (ie, not empty) */
const char *format = "%-18s %-11s %s\n"; const char *format = "%-18s %-11s %s\n";
printf (format, "Prefix", "Type", "Flags"); printf (format, "Prefix", "Type", "Flags");

176
winsup/utils/umount.cc
View File

@ -14,31 +14,39 @@ details. */
#include <mntent.h> #include <mntent.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <getopt.h>
static void remove_all_mounts (); static void remove_all_mounts ();
static void remove_all_automounts ();
static void remove_all_user_mounts (); static void remove_all_user_mounts ();
static void remove_all_system_mounts (); static void remove_all_system_mounts ();
static void remove_cygdrive_prefix (int flags); static void remove_cygdrive_prefix (int flags);
static const char *progname; static const char *progname;
struct option longopts[] =
{
{"remove-all-mounts", no_argument, NULL, 'A'},
{"remove-cygdrive-prefix", no_argument, NULL, 'c'},
{"remove-system-mounts", no_argument, NULL, 'S'},
{"remove-user-mounts", no_argument, NULL, 'U'},
{"system", no_argument, NULL, 's'},
{"user", no_argument, NULL, 'u'},
{NULL, 0, NULL, 0}
};
char opts[] = "RSUsuc";
static void static void
usage (void) usage (void)
{ {
fprintf (stderr, "Usage %s [-s] <posixpath>\n", progname); fprintf (stderr, "Usage %s [OPTION] [<posixpath>]\n\
fprintf (stderr, -A, --remove-all-mounts remove all mounts\n\
"-s = remove mount point from system-wide registry location\n"); -c, --remove-cygdrive-prefix remove cygdrive prefix\n\
fprintf (stderr, "\n"); -s, --system remove system mount\n\
fprintf (stderr, "--remove-all-mounts = remove all mounts\n"); -S, --remove-system-mounts remove all system mounts\n\
fprintf (stderr, -u, --user remove user mount\n\
"--remove-auto-mounts = remove all automatically mounted mounts\n"); -U, --remove-user-mounts remove all user mounts\n\
fprintf (stderr, ", progname);
"--remove-user-mounts = remove all mounts in the current user mount registry area, including auto mounts\n");
fprintf (stderr,
"--remove-system-mounts = remove all mounts in the system-wide mount registry area\n");
fprintf (stderr,
"[-s] --remove-cygdrive-prefix = remove cygdrive path prefix\n");
exit (1); exit (1);
} }
@ -55,54 +63,80 @@ main (int argc, char **argv)
int i; int i;
int flags = 0; int flags = 0;
progname = argv[0]; progname = argv[0];
enum do_what
{
nada,
saw_remove_all_mounts,
saw_remove_cygdrive_prefix,
saw_remove_all_system_mounts,
saw_remove_all_user_mounts
} do_what = nada;
if (argc == 1) if (argc == 1)
usage (); usage ();
for (i = 1; i < argc; ++i) while ((i = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
{ switch (i)
if (argv[i][0] != '-') {
case 'A':
if (do_what != nada)
usage ();
do_what = saw_remove_all_mounts;
break; break;
case 'c':
if (strcmp (argv[i], "-s") == 0) if (do_what != nada)
{ usage ();
flags |= MOUNT_SYSTEM; do_what = saw_remove_cygdrive_prefix;
} break;
else if (strcmp (argv[i], "--remove-all-mounts") == 0) case 's':
{ flags |= MOUNT_SYSTEM;
remove_all_mounts (); break;
exit (0); case 'S':
} if (do_what != nada)
else if (strcmp (argv[i], "--remove-user-mounts") == 0) usage ();
{ do_what = saw_remove_all_system_mounts;
remove_all_user_mounts (); break;
exit (0); case 'u':
} flags &= ~MOUNT_SYSTEM;
else if (strcmp (argv[i], "--remove-system-mounts") == 0) break;
{ case 'U':
remove_all_system_mounts (); if (do_what != nada)
exit (0); usage ();
} do_what = saw_remove_all_user_mounts;
else if (strcmp (argv[i], "--remove-auto-mounts") == 0) break;
{ default:
remove_all_automounts ();
exit (0);
}
else if (strcmp (argv[i], "--remove-cygdrive-prefix") == 0)
{
remove_cygdrive_prefix (flags);
exit (0);
}
else
usage (); usage ();
}
switch (do_what)
{
case saw_remove_all_mounts:
if (optind != argc)
usage ();
remove_all_mounts ();
break;
case saw_remove_cygdrive_prefix:
if (optind != argc)
usage ();
remove_cygdrive_prefix (flags);
break;
case saw_remove_all_system_mounts:
if (optind != argc)
usage ();
remove_all_system_mounts ();
break;
case saw_remove_all_user_mounts:
if (optind != argc)
usage ();
remove_all_user_mounts ();
break;
default:
if (optind != argc - 1)
usage ();
if (cygwin_umount (argv[optind], flags) != 0)
error (argv[optind]);
} }
if ((i + 1) != argc)
usage ();
if (cygwin_umount (argv[i], flags) != 0)
error (argv[i]);
return 0; return 0;
} }
@ -114,39 +148,6 @@ remove_all_mounts ()
remove_all_system_mounts (); remove_all_system_mounts ();
} }
/* remove_all_automounts: Unmount all automounts. */
static void
remove_all_automounts ()
{
FILE *m = setmntent ("/-not-used-", "r");
struct mntent *p;
while ((p = getmntent (m)) != NULL)
{
/* Remove the mount if it's an automount. */
if (strcmp (p->mnt_type, "user,auto") == 0)
{
if (cygwin_umount (p->mnt_dir, 0))
error (p->mnt_dir);
/* We've modified the table so we need to start over. */
endmntent (m);
m = setmntent ("/-not-used-", "r");
}
else if (strcmp (p->mnt_type, "system,auto") == 0)
{
if (cygwin_umount (p->mnt_dir, MOUNT_SYSTEM))
error (p->mnt_dir);
/* We've modified the table so we need to start over. */
endmntent (m);
m = setmntent ("/-not-used-", "r");
}
}
endmntent (m);
}
/* remove_all_user_mounts: Unmount all user mounts. */ /* remove_all_user_mounts: Unmount all user mounts. */
static void static void
remove_all_user_mounts () remove_all_user_mounts ()
@ -202,4 +203,5 @@ remove_cygdrive_prefix (int flags)
int res = cygwin_umount (NULL, flags | MOUNT_AUTO); int res = cygwin_umount (NULL, flags | MOUNT_AUTO);
if (res) if (res)
error ("remove_cygdrive_prefix"); error ("remove_cygdrive_prefix");
exit (0);
} }