[PATCH 4/5] nsenter: Replace a bare strtoul with strtoul_or_err

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxx>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux