Attachment 898682 Details for Bug 1005725 – patch to fix - v1

patch to fix - v1

file_1005725.txt (text/plain), 1.67 KB, created by JianHong Yin on 2014-05-23 13:50:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: JianHong Yin

Created: 2014-05-23 13:50:37 UTC

Size: 1.67 KB

patch

obsolete

>[root@dhcp12-241 nfs-utils]# diff -pNu nfs-utils-1.2.3{,.new}/utils/mount/mount.c
>--- nfs-utils-1.2.3/utils/mount/mount.c 2014-05-23 21:45:19.381377812 +0800
>+++ nfs-utils-1.2.3.new/utils/mount/mount.c     2014-05-23 21:47:20.777873831 +0800
>@@ -464,26 +464,14 @@ 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);
>        }
> 
>-       spec = argv[1];
>-       mount_point = argv[2];
>-
>        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':
>@@ -526,6 +514,14 @@ int main(int argc, char *argv[])
>        if (optind != argc - 2) {
>                mount_usage();
>                goto out_usage;
>+       } else {
>+               while (optind < argc) {
>+                       if (!spec)
>+                               spec = argv[optind];
>+                       else
>+                               mount_point = argv[optind];
>+                       optind++;
>+               }
>        }
> 
>        if (strcmp(progname, "mount.nfs4") == 0)

Actions: View

Attachments on bug 1005725: 898682