summaryrefslogtreecommitdiffstats
path: root/sys-utils
diff options
context:
space:
mode:
authorSami Kerola2013-01-30 21:33:24 +0100
committerKarel Zak2013-02-06 11:51:17 +0100
commit07ff972eb684cfc88ca1931123fc255927393118 (patch)
treea80a15a3a7dc03bff8c402ea27e4269f4a01644a /sys-utils
parenta pointer should not be compared to zero [coccinelle] (diff)
downloadkernel-qcow2-util-linux-07ff972eb684cfc88ca1931123fc255927393118.tar.gz
kernel-qcow2-util-linux-07ff972eb684cfc88ca1931123fc255927393118.tar.xz
kernel-qcow2-util-linux-07ff972eb684cfc88ca1931123fc255927393118.zip
translation: unify exec error messages
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'sys-utils')
-rw-r--r--sys-utils/flock.c2
-rw-r--r--sys-utils/nsenter.c2
-rw-r--r--sys-utils/prlimit.c2
-rw-r--r--sys-utils/rtcwake.c2
-rw-r--r--sys-utils/setarch.c4
-rw-r--r--sys-utils/setsid.c2
-rw-r--r--sys-utils/swapon.c2
-rw-r--r--sys-utils/unshare.c2
8 files changed, 9 insertions, 9 deletions
diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index 6147e97ea..24576b139 100644
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -317,7 +317,7 @@ int main(int argc, char *argv[])
close(fd);
execvp(cmd_argv[0], cmd_argv);
/* execvp() failed */
- warn("%s", cmd_argv[0]);
+ warn(_("failed to execute %s"), cmd_argv[0]);
_exit((errno == ENOMEM) ? EX_OSERR : EX_UNAVAILABLE);
} else {
do {
diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
index b6e6dc1a4..3df433812 100644
--- a/sys-utils/nsenter.c
+++ b/sys-utils/nsenter.c
@@ -319,5 +319,5 @@ int main(int argc, char *argv[])
execvp(argv[optind], argv + optind);
- err(EXIT_FAILURE, _("exec %s failed"), argv[optind]);
+ err(EXIT_FAILURE, _("failed to execute %s"), argv[optind]);
}
diff --git a/sys-utils/prlimit.c b/sys-utils/prlimit.c
index a619bea3e..9098e4976 100644
--- a/sys-utils/prlimit.c
+++ b/sys-utils/prlimit.c
@@ -637,7 +637,7 @@ int main(int argc, char **argv)
if (argc > optind) {
/* prlimit [options] COMMAND */
execvp(argv[optind], &argv[optind]);
- err(EXIT_FAILURE, _("executing %s failed"), argv[optind]);
+ err(EXIT_FAILURE, _("failed to execute %s"), argv[optind]);
}
return EXIT_SUCCESS;
diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
index 0edf7dc81..f0dada2e0 100644
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -573,7 +573,7 @@ int main(int argc, char **argv)
if (!dryrun) {
execv(arg[0], arg);
- warn(_("unable to execute %s"), _PATH_SHUTDOWN);
+ warn(_("failed to execute %s"), _PATH_SHUTDOWN);
rc = EXIT_FAILURE;
}
diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
index d13cdd621..afa2d1bf1 100644
--- a/sys-utils/setarch.c
+++ b/sys-utils/setarch.c
@@ -279,7 +279,7 @@ int main(int argc, char *argv[])
if (set_arch(p, 0L))
err(EXIT_FAILURE, _("Failed to set personality to %s"), p);
execl("/bin/bash", NULL);
- err(EXIT_FAILURE, "/bin/bash");
+ err(EXIT_FAILURE, _("failed to execute %s"), "/bin/bash");
}
#endif
@@ -342,7 +342,7 @@ int main(int argc, char *argv[])
if (!argc) {
execl("/bin/sh", "-sh", NULL);
- err(EXIT_FAILURE, "/bin/sh");
+ err(EXIT_FAILURE, _("failed to execute %s"), "/bin/sh");
}
execvp(argv[0], argv);
diff --git a/sys-utils/setsid.c b/sys-utils/setsid.c
index 20bd0d7ba..b3e6ebfaf 100644
--- a/sys-utils/setsid.c
+++ b/sys-utils/setsid.c
@@ -94,5 +94,5 @@ int main(int argc, char **argv)
warn(_("failed to set the controlling terminal"));
}
execvp(argv[optind], argv + optind);
- err(EXIT_FAILURE, _("execvp failed"));
+ err(EXIT_FAILURE, _("failed to execute %s"), argv[optind]);
}
diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 6efe48296..d5b7e3789 100644
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -279,7 +279,7 @@ static int swap_reinitialize(const char *device,
cmd[idx++] = (char *) device;
cmd[idx++] = NULL;
execv(cmd[0], cmd);
- err(EXIT_FAILURE, _("execv failed"));
+ err(EXIT_FAILURE, _("failed to execute %s"), cmd[0]);
default: /* parent */
do {
diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
index 4639ac8e6..62d2fcbbf 100644
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@ -115,5 +115,5 @@ int main(int argc, char *argv[])
execvp(argv[optind], argv + optind);
- err(EXIT_FAILURE, _("exec %s failed"), argv[optind]);
+ err(EXIT_FAILURE, _("failed to execute %s"), argv[optind]);
}