mount.nfs: add new string tokenizer facility

[nfs-utils.git] / utils / mount / mount.c

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 751fbb9c74b0c1a5c5b6007da4ef1f6d78dddaea..e6222317530da30c1ad56e2a217861d60cc2cdab 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -237,6 +237,7 @@ static int add_mtab(char *spec, char *mount_point, char *fstype,
 
        if (flags & MS_REMOUNT) {
                update_mtab(ment.mnt_dir, &ment);
+               free(ment.mnt_opts);
                return EX_SUCCESS;
        }
 
@@ -267,6 +268,7 @@ fail_close:
        endmntent(mtab);
 fail_unlock:
        unlock_mtab();
+       free(ment.mnt_opts);
 
        return result;
 }
@@ -468,19 +470,19 @@ int main(int argc, char *argv[])
                                nfs_error(_("%s: Passing mount options via a"
                                        " string is unsupported by this"
                                        " kernel\n"), progname);
-                               exit(EX_USAGE);
+                               goto out_usage;
                        }
                        if (uid != 0) {
                                nfs_error(_("%s: -i option is restricted to 'root'\n"),
                                        progname);
-                               exit(EX_USAGE);
+                               goto out_usage;
                        }
                        ++string;
                        break;
                case 'h':
                default:
                        mount_usage();
-                       exit(EX_USAGE);
+                       goto out_usage;
                }
        }
 
@@ -489,7 +491,7 @@ int main(int argc, char *argv[])
         */
        if (optind != argc - 2) {
                mount_usage();
-               exit(EX_USAGE);
+               goto out_usage;
        }
 
        if (strcmp(progname, "mount.nfs4") == 0)
@@ -508,7 +510,7 @@ int main(int argc, char *argv[])
                    strcmp(mc->m.mnt_type, fs_type) != 0) {
                        nfs_error(_("%s: permission denied: no match for %s "
                                "found in /etc/fstab"), progname, mount_point);
-                       exit(EX_USAGE);
+                       goto out_usage;
                }
 
                /*
@@ -523,7 +525,7 @@ int main(int argc, char *argv[])
        mount_point = canonicalize(mount_point);
        if (!mount_point) {
                nfs_error(_("%s: no mount point provided"), progname);
-               exit(EX_USAGE);
+               goto out_usage;
        }
        if (mount_point[0] != '/') {
                nfs_error(_("%s: unrecognized mount point %s"),
@@ -573,6 +575,12 @@ int main(int argc, char *argv[])
        }
 
 out:
+       free(mount_opts);
+       free(extra_opts);
        free(mount_point);
        exit(mnt_err);
+
+out_usage:
+       free(mount_opts);
+       exit(EX_USAGE);
 }