From 684cf4a5e0e84a1367690d7ecf4882cbdf4f3228 Mon Sep 17 00:00:00 2001 From: Prem Karat Date: Thu, 30 Jun 2011 07:29:20 -0400 Subject: [PATCH] mount.nfs: Fix for the bug in v1.2.4 that breaks mount.nfs commit 30ebf047 failed to include these changes that breaks mount.nfs. mount.nfs will continue to work fine with these changes Signed-off-by: Steve Dickson --- utils/mount/mount.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/utils/mount/mount.c b/utils/mount/mount.c index 62115bb..eea00af 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -385,14 +385,6 @@ int main(int argc, char *argv[]) if(!strncmp(progname, "umount", strlen("umount"))) exit(nfsumount(argc, argv)); - if (argv[1] && argv[1][0] == '-') { - if(argv[1][1] == 'V') - printf("%s ("PACKAGE_STRING")\n", progname); - else - mount_usage(); - exit(EX_SUCCESS); - } - if ((argc < 3)) { mount_usage(); exit(EX_USAGE); @@ -400,8 +392,7 @@ int main(int argc, char *argv[]) mount_config_init(progname); - argv[2] = argv[0]; /* so that getopt error messages are correct */ - while ((c = getopt_long(argc - 2, argv + 2, "rvVwfno:hs", + while ((c = getopt_long(argc, argv, "rvVwfno:hs", longopts, NULL)) != -1) { switch (c) { case 'r': -- 2.39.2