From 0d3ec8603b5ac6baf6068135ef95aa70c14b9e07 Mon Sep 17 00:00:00 2001 From: Eric W. Biederman Date: Wed, 16 Jan 2013 16:35:53 -0800 Subject: nsenter: Replace a bare strtoul with strtoul_or_err This is shorter code and makes things a bit clearer and less error prone if anyone happens to copy the code. Signed-off-by: "Eric W. Biederman" --- sys-utils/nsenter.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'sys-utils/nsenter.c') diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c index 76e942df1..99b18b05f 100644 --- a/sys-utils/nsenter.c +++ b/sys-utils/nsenter.c @@ -27,6 +27,7 @@ #include #include +#include "strutils.h" #include "nls.h" #include "c.h" #include "closestream.h" @@ -198,7 +199,6 @@ int main(int argc, char *argv[]) struct namespace_file *nsfile; int do_fork = 0; - char *end; int c; setlocale(LC_MESSAGES, ""); @@ -214,13 +214,7 @@ int main(int argc, char *argv[]) printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; case 't': - errno = 0; - namespace_target_pid = strtoul(optarg, &end, 10); - if (!*optarg || (*optarg && *end) || errno != 0) { - err(EXIT_FAILURE, - _("Pid '%s' is not a valid number"), - optarg); - } + namespace_target_pid = strtoul_or_err(optarg, _("failed to parse pid")); break; case 'm': open_namespace_fd(CLONE_NEWNS, optarg); -- cgit v1.2.3-55-g7522