X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fmount.c;h=21946f727990af960e72ca2ad768b91adf134388;hp=4b78021a5d1446d01a7ef8aee6c5ce84f8cf825e;hb=b9f4b66a81420b0832ce4ef6965b1cdc9615772c;hpb=eb6dca418a2f862a5a478d4613e0c70598c93d53

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 4b78021..21946f7 100644
--- 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;
 }
@@ -374,14 +376,10 @@ static int try_mount(char *spec, char *mount_point, int flags,
 {
 	int ret;
 
-	if (string) {
-		if (strcmp(fs_type, "nfs4") == 0)
-			ret = nfs4mount_s(spec, mount_point, flags,
-						extra_opts, fake, bg);
-		else
-			ret = nfsmount_s(spec, mount_point, flags,
-						extra_opts, fake, bg);
-	} else {
+	if (string)
+		ret = nfsmount_string(spec, mount_point, fs_type, flags,
+					extra_opts, fake, bg);
+	else {
 		if (strcmp(fs_type, "nfs4") == 0)
 			ret = nfs4mount(spec, mount_point, flags,
 					extra_opts, fake, bg);
@@ -421,7 +419,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 +442,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 +466,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 +487,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 +506,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 +521,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 +548,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 +571,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);
 }