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 a38c5c38cb93c2a109882ac0fb183c82b943a0cd..a19ee8901fa8c96b6f286ad4f7f1ea386d767abb 100644 (file)
--- 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 ec50cb3307d679e23e431759b6db74689591f144..fbfcf983181e4cbe24225106891eaaab4e36ab9f 100644 (file)
--- 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 e8d95822ed9c63c5324465fd2c51a5e835882528..6f806362d1f0662e9930b071fb22b85b8b348dcf 100644 (file)
--- 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 6f5c8d6b38df8432e0b781938e014a9acef342d0..e7d6988d56404e50e59dc720ba9332d10eed690e 100644 (file)
--- 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 2402e624f467ed31fc27e9c14d6bf081c3cb46c3..4147978cc67dbd011b0443bdbb1f5d17fe5b5efd 100644 (file)
--- 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 2991da058304805757bd84413e4f7e1076337609..8b4f83dd2ef06b9c00221d3a9bee27014ebdd61b 100644 (file)
--- 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 13437f7719b3bb16a2e1b5b2e40a41c653430b9d..757601ae6520d5df917da4e541f276088e55ac04 100644 (file)
--- 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 87f178c36d9f6ac642175d918d0d47733f462890..3c66d01867a005dbe88bbcbc154b009c561acbd2 100644 (file)
--- 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 f26b148f708870ef09c73fca9526844fa00afc88..161cd27b96a0187c4109100a651e5f11de844c49 100644 (file)
--- 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();
 }