From: Eric Biggers <ebiggers3@gmail.com>
Date: Tue, 18 Dec 2012 18:30:51 +0000 (-0600)
Subject: Improve execute_fusermount()
X-Git-Tag: v1.2.1~24
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=dbdabb090020f9311a793cff0c6cf53ed7e7410b

Improve execute_fusermount()

- Use waitpid() instead of wait()
- Check exit statuses correctly
---

diff --git a/src/mount_image.c b/src/mount_image.c
index b3ae030d..7f0a2aa0 100644
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -1389,46 +1389,53 @@ static int execute_fusermount(const char *dir)
 	}
 
 	/* Parent */
-	ret = wait(&status);
+	ret = waitpid(pid, &status, 0);
 	if (ret == -1) {
 		ERROR_WITH_ERRNO("Failed to wait for fusermount process to "
 				 "terminate");
 		return WIMLIB_ERR_FUSERMOUNT;
 	}
 
-	if (status != 0) {
-		if (status == WIMLIB_ERR_FUSERMOUNT)
-			ERROR("Could not find the `fusermount' program");
-		else
-			ERROR("fusermount exited with status %d", status);
+	if (!WIFEXITED(status)) {
+		ERROR("'fusermount' did not terminate normally!");
+		return WIMLIB_ERR_FUSERMOUNT;
+	}
 
-		/* Try again, but with the `umount' program.  This is required
-		 * on other FUSE implementations such as FreeBSD's that do not
-		 * have a `fusermount' program. */
+	status = WEXITSTATUS(status);
 
-		pid = fork();
-		if (pid == -1) {
-			ERROR_WITH_ERRNO("Failed to fork()");
-			return WIMLIB_ERR_FORK;
-		}
-		if (pid == 0) {
-			/* Child */
-			execlp("umount", "umount", dir, NULL);
-			ERROR_WITH_ERRNO("Failed to execute `umount'");
-			exit(WIMLIB_ERR_FUSERMOUNT);
-		}
+	if (status == 0)
+		return 0;
 
-		/* Parent */
-		ret = wait(&status);
-		if (ret == -1) {
-			ERROR_WITH_ERRNO("Failed to wait for `umount' process to "
-					 "terminate");
-			return WIMLIB_ERR_FUSERMOUNT;
-		}
-		if (status != 0) {
-			ERROR("`umount' exited with failure status");
-			return WIMLIB_ERR_FUSERMOUNT;
-		}
+	if (status != WIMLIB_ERR_FUSERMOUNT)
+		return WIMLIB_ERR_FUSERMOUNT;
+
+	/* Try again, but with the `umount' program.  This is required on other
+	 * FUSE implementations such as FreeBSD's that do not have a
+	 * `fusermount' program. */
+	ERROR("Falling back to 'umount'.  Note: you may need to be "
+	      "root for this to work");
+	pid = fork();
+	if (pid == -1) {
+		ERROR_WITH_ERRNO("Failed to fork()");
+		return WIMLIB_ERR_FORK;
+	}
+	if (pid == 0) {
+		/* Child */
+		execlp("umount", "umount", dir, NULL);
+		ERROR_WITH_ERRNO("Failed to execute `umount'");
+		exit(WIMLIB_ERR_FUSERMOUNT);
+	}
+
+	/* Parent */
+	ret = waitpid(pid, &status, 0);
+	if (ret == -1) {
+		ERROR_WITH_ERRNO("Failed to wait for `umount' process to "
+				 "terminate");
+		return WIMLIB_ERR_FUSERMOUNT;
+	}
+	if (status != 0) {
+		ERROR("`umount' did not successfully complete");
+		return WIMLIB_ERR_FUSERMOUNT;
 	}
 	return 0;
 }