nfs-utils: fix for the bug in v1.2.4 that breaks mount.nfs

Commit Message

Prem Karat June 30, 2011, 10:56 a.m. UTC

commit 30ebf04700654deddbf5f57d95e84ec69cea8610 failed to include these changes that breaks mount.nfs.
mount.nfs would continue to work fine with these changes

Signed-off-by: Prem Karat <[e-mail]>
---
 utils/mount/mount.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

Patch

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':