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 4b78021a5d1446d01a7ef8aee6c5ce84f8cf825e..e6222317530da30c1ad56e2a217861d60cc2cdab 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -237,7 +237,8 @@ static int add_mtab(char *spec, char *mount_point, char *fstype,
 
        if (flags & MS_REMOUNT) {
                update_mtab(ment.mnt_dir, &ment);
-               return 0;
+               free(ment.mnt_opts);
+               return EX_SUCCESS;
        }
 
        lock_mtab();
@@ -261,12 +262,13 @@ static int add_mtab(char *spec, char *mount_point, char *fstype,
                goto fail_close;
        }
 
-       result = 0;
+       result = EX_SUCCESS;
 
 fail_close:
        endmntent(mtab);
 fail_unlock:
        unlock_mtab();
+       free(ment.mnt_opts);
 
        return result;
 }
@@ -421,7 +423,7 @@ int main(int argc, char *argv[])
                        printf("%s ("PACKAGE_STRING")\n", progname);
                else
                        mount_usage();
-               exit(0);
+               exit(EX_SUCCESS);
        }
 
        if ((argc < 3)) {
@@ -444,7 +446,7 @@ int main(int argc, char *argv[])
                        break;
                case 'V':
                        printf("%s: ("PACKAGE_STRING")\n", progname);
-                       exit(0);
+                       exit(EX_SUCCESS);
                case 'w':
                        flags &= ~MS_RDONLY;
                        break;
@@ -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"),
@@ -550,14 +552,19 @@ int main(int argc, char *argv[])
        mnt_err = try_mount(spec, mount_point, flags, fs_type, &extra_opts,
                                mount_opts, fake, nomtab, FOREGROUND);
        if (mnt_err == EX_BG) {
-               printf(_("mount: backgrounding \"%s\"\n"), spec);
+               printf(_("%s: backgrounding \"%s\"\n"),
+                       progname, spec);
                fflush(stdout);
 
                /*
                 * Parent exits immediately with success.
                 */
-               if (fork() > 0)
-                       exit(0);
+               if (daemon(0, 0)) {
+                       nfs_error(_("%s: failed to start "
+                                       "background process: %s\n"),
+                                               progname, strerror(errno));
+                       exit(EX_FAIL);
+               }
 
                mnt_err = try_mount(spec, mount_point, flags, fs_type,
                                        &extra_opts, mount_opts, fake,
@@ -568,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);
 }