From 865ab4b83fe77798b55aa0030139840837d78c89 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Thu, 27 Apr 2000 03:44:23 +0000 Subject: [PATCH] * mount.cc (main): Add "-X" option to specify a "Cygwin executable". --- winsup/utils/ChangeLog | 22 +++++++++------ winsup/utils/mount.cc | 64 ++++++++++++++++++++++-------------------- 2 files changed, 46 insertions(+), 40 deletions(-) diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 840b8bb3a..ae48b8197 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,14 +1,18 @@ +Wed Apr 26 23:43:25 2000 Christopher Faylor + + * mount.cc (main): Add "-X" option to specify a "Cygwin executable". + Sat Apr 15 23:34:00 2000 Corinna Vinschen - * mkpasswd.c (main): Use GetDCName instead of GetAnyDCName. - Don't create extra passwd entry for administrators group - if local_groups is set. - (usage): Change usage text slightly. - (enum_users): Loop while ERROR_MORE_DATA is returned. - (enum_local_groups): Ditto. - * mkgroup.c (enum_local_groups): Ditto. - (enum_groups) Ditto. - (usage): Change usage text slightly. + * mkpasswd.c (main): Use GetDCName instead of GetAnyDCName. + Don't create extra passwd entry for administrators group + if local_groups is set. + (usage): Change usage text slightly. + (enum_users): Loop while ERROR_MORE_DATA is returned. + (enum_local_groups): Ditto. + * mkgroup.c (enum_local_groups): Ditto. + (enum_groups) Ditto. + (usage): Change usage text slightly. Thu Apr 13 01:22:35 2000 Christopher Faylor diff --git a/winsup/utils/mount.cc b/winsup/utils/mount.cc index 2c348703a..86db5339b 100644 --- a/winsup/utils/mount.cc +++ b/winsup/utils/mount.cc @@ -114,42 +114,44 @@ main (int argc, const char **argv) for (i = 1; i < argc; ++i) { - if (argv[i][0] != '-') - break; + if (argv[i][0] != '-') + break; - if (strcmp (argv[i], "--change-cygdrive-prefix") == 0) - { - if ((i + 2) != argc) - usage (); + 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 (); + 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], "-b") == 0) - flags |= MOUNT_BINARY; - else if (strcmp (argv[i], "-t") == 0) - flags &= ~MOUNT_BINARY; + cygwin_internal (CW_READ_V1_MOUNT_TABLES); + exit (0); + } + else if (strcmp (argv[i], "-b") == 0) + flags |= MOUNT_BINARY; + else if (strcmp (argv[i], "-t") == 0) + flags &= ~MOUNT_BINARY; + else if (strcmp (argv[i], "-X") == 0) + flags |= MOUNT_CYGWIN_EXEC; #if 0 - else if (strcmp (argv[i], "-c") == 0) - create_missing_dirs = TRUE; + else if (strcmp (argv[i], "-x") == 0) + create_missing_dirs = TRUE; #endif - 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; - else - usage (); + 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; + else + usage (); } if ((i + 2) != argc)