From: Karel Zak <kzak@redhat.com>
Date: Thu, 1 Feb 2018 14:44:25 +0000 (+0100)
Subject: sys-utils: use errexec()
X-Git-Tag: v2.32-rc1~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd777151bf71eb8e2238a24e20efa8ce132e74e9;p=thirdparty%2Futil-linux.git

sys-utils: use errexec()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/eject.c b/sys-utils/eject.c
index a38c5c38cb..a19ee8901f 100644
--- a/sys-utils/eject.c
+++ b/sys-utils/eject.c
@@ -667,7 +667,7 @@ static void umount_one(const struct eject_control *ctl, const char *name)
 		else
 			execl("/bin/umount", "/bin/umount", name, NULL);
 
-		errx(EXIT_FAILURE, _("unable to exec /bin/umount of `%s'"), name);
+		errexec("/bin/umount");
 
 	case -1:
 		warn( _("unable to fork"));
diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
index ec50cb3307..fbfcf98318 100644
--- a/sys-utils/nsenter.c
+++ b/sys-utils/nsenter.c
@@ -478,7 +478,7 @@ int main(int argc, char *argv[])
 
 	if (optind < argc) {
 		execvp(argv[optind], argv + optind);
-		err(EXIT_FAILURE, _("failed to execute %s"), argv[optind]);
+		errexec(argv[optind]);
 	}
 	exec_shell();
 }
diff --git a/sys-utils/prlimit.c b/sys-utils/prlimit.c
index e8d95822ed..6f806362d1 100644
--- a/sys-utils/prlimit.c
+++ b/sys-utils/prlimit.c
@@ -639,7 +639,7 @@ int main(int argc, char **argv)
 	if (argc > optind) {
 		/* prlimit [options] COMMAND */
 		execvp(argv[optind], &argv[optind]);
-		err(EXIT_FAILURE, _("failed to execute %s"), argv[optind]);
+		errexec(argv[optind]);
 	}
 
 	return EXIT_SUCCESS;
diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
index 6f5c8d6b38..e7d6988d56 100644
--- a/sys-utils/setarch.c
+++ b/sys-utils/setarch.c
@@ -294,7 +294,7 @@ int main(int argc, char *argv[])
 			if (set_arch(arch, 0L, 0))
 				err(EXIT_FAILURE, _("Failed to set personality to %s"), arch);
 			execl("/bin/bash", "", NULL);
-			err(EXIT_FAILURE, _("failed to execute %s"), "/bin/bash");
+			errexec("/bin/bash");
 		}
 #endif
 	} else {
@@ -381,10 +381,9 @@ int main(int argc, char *argv[])
 
 	if (!argc) {
 		execl("/bin/sh", "-sh", NULL);
-		err(EXIT_FAILURE, _("failed to execute %s"), "/bin/sh");
+		errexec("/bin/sh");
 	}
 
 	execvp(argv[0], argv);
-	err(EXIT_FAILURE, "%s", argv[0]);
-	return EXIT_FAILURE;
+	errexec(argv[0]);
 }
diff --git a/sys-utils/setpriv.c b/sys-utils/setpriv.c
index 2402e624f4..4147978cc6 100644
--- a/sys-utils/setpriv.c
+++ b/sys-utils/setpriv.c
@@ -990,6 +990,5 @@ int main(int argc, char **argv)
 	}
 
 	execvp(argv[optind], argv + optind);
-
-	err(EXIT_FAILURE, _("cannot execute: %s"), argv[optind]);
+	errexec(argv[optind]);
 }
diff --git a/sys-utils/setsid.c b/sys-utils/setsid.c
index 2991da0583..8b4f83dd2e 100644
--- a/sys-utils/setsid.c
+++ b/sys-utils/setsid.c
@@ -119,5 +119,5 @@ int main(int argc, char **argv)
 	if (ctty && ioctl(STDIN_FILENO, TIOCSCTTY, 1))
 		err(EXIT_FAILURE, _("failed to set the controlling terminal"));
 	execvp(argv[optind], argv + optind);
-	err(EXIT_FAILURE, _("failed to execute %s"), argv[optind]);
+	errexec(argv[optind]);
 }
diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 13437f7719..757601ae65 100644
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -341,7 +341,7 @@ static int swap_reinitialize(struct swap_device *dev)
 		cmd[idx++] = dev->path;
 		cmd[idx++] = NULL;
 		execvp(cmd[0], (char * const *) cmd);
-		err(EXIT_FAILURE, _("failed to execute %s"), cmd[0]);
+		errexec(cmd[0]);
 
 	default: /* parent */
 		do {
@@ -353,7 +353,7 @@ static int swap_reinitialize(struct swap_device *dev)
 			return -1;
 		}
 
-		/* mkswap returns: 0=suss, 1=error */
+		/* mkswap returns: 0=suss, >0 error */
 		if (WIFEXITED(status) && WEXITSTATUS(status)==0)
 			return 0; /* ok */
 		break;
diff --git a/sys-utils/switch_root.c b/sys-utils/switch_root.c
index 87f178c36d..3c66d01867 100644
--- a/sys-utils/switch_root.c
+++ b/sys-utils/switch_root.c
@@ -258,6 +258,6 @@ int main(int argc, char *argv[])
 		warn(_("cannot access %s"), init);
 
 	execv(init, initargs);
-	err(EXIT_FAILURE, _("failed to execute %s"), init);
+	errexec(init);
 }
 
diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
index f26b148f70..161cd27b96 100644
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@ -475,7 +475,7 @@ int main(int argc, char *argv[])
 
 	if (optind < argc) {
 		execvp(argv[optind], argv + optind);
-		err(EXIT_FAILURE, _("failed to execute %s"), argv[optind]);
+		errexec(argv[optind]);
 	}
 	exec_shell();
 }