From: ebiederm@xmission.com (Eric W. Biederman)
To: Karel Zak <kzak@redhat.com>
Cc: Mike Frysinger <vapier@gentoo.org>,
util-linux@vger.kernel.org, Neil Horman <nhorman@tuxdriver.com>,
"Serge E. Hallyn" <serge@hallyn.com>,
"Michael Kerrisk \(man-pages\)" <mtk.manpages@gmail.com>
Subject: [PATCH 4/5] nsenter: Replace a bare strtoul with strtoul_or_err
Date: Wed, 16 Jan 2013 16:35:53 -0800 [thread overview]
Message-ID: <87mww8k5na.fsf_-_@xmission.com> (raw)
In-Reply-To: <87a9s8lkbq.fsf_-_@xmission.com> (Eric W. Biederman's message of "Wed, 16 Jan 2013 16:33:29 -0800")
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" <ebiederm@xmission.com>
---
sys-utils/nsenter.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
index 5b8d9c4..cc54ebe 100644
--- a/sys-utils/nsenter.c
+++ b/sys-utils/nsenter.c
@@ -27,6 +27,7 @@
#include <stdlib.h>
#include <unistd.h>
+#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);
--
1.7.5.4
next prev parent reply other threads:[~2013-01-17 0:36 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-11 10:29 [PATCH] enter: new command (light wrapper around setns) Eric W. Biederman
2013-01-11 10:54 ` Michael Kerrisk (man-pages)
2013-01-11 11:10 ` Eric W. Biederman
2013-01-11 13:13 ` Ángel González
2013-01-12 8:59 ` Michael Kerrisk (man-pages)
2013-01-11 16:13 ` Karel Zak
2013-01-11 22:11 ` Eric W. Biederman
2013-01-12 9:01 ` Michael Kerrisk (man-pages)
2013-01-11 22:46 ` [PATCH] nsenter: " Eric W. Biederman
2013-01-11 23:45 ` Mike Frysinger
2013-01-14 8:28 ` Karel Zak
2013-01-17 0:33 ` [PATCH 0/5] nsenter review comment fixes Eric W. Biederman
2013-01-17 0:34 ` [PATCH 1/5] nsenter: Enhance waiting for a child process Eric W. Biederman
2013-01-17 0:34 ` [PATCH 2/5] nsenter: Properly spell significant in a comment Eric W. Biederman
2013-01-17 0:35 ` [PATCH 3/5] nsenter: Add const to declarations where possible Eric W. Biederman
2013-01-17 0:35 ` Eric W. Biederman [this message]
2013-01-17 0:36 ` [PATCH 5/5] unshare,nsenter: Move the old libc handling into a common header namespace.h Eric W. Biederman
2013-01-17 3:11 ` [PATCH 0/5] nsenter review comment fixes Mike Frysinger
2013-01-17 12:35 ` Karel Zak
2013-01-15 18:51 ` [PATCH] nsenter: new command (light wrapper around setns) Serge E. Hallyn
2013-01-17 12:34 ` Karel Zak
2013-01-11 22:53 ` [PATCH] unshare: Add support for the pid and user namespaces Eric W. Biederman
2013-01-17 12:35 ` Karel Zak
2013-01-17 12:56 ` Eric W. Biederman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mww8k5na.fsf_-_@xmission.com \
--to=ebiederm@xmission.com \
--cc=kzak@redhat.com \
--cc=mtk.manpages@gmail.com \
--cc=nhorman@tuxdriver.com \
--cc=serge@hallyn.com \
--cc=util-linux@vger.kernel.org \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox