From adf7af0e709a0e9f4bda6f9af255baa64b153f14 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Sat, 16 Oct 2021 02:34:38 +0900 Subject: [PATCH] lsfd: (helper) improve the code converting file descriptor numbers Signed-off-by: Masatake YAMATO --- tests/helpers/test_mkfds.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/helpers/test_mkfds.c b/tests/helpers/test_mkfds.c index 369b291c64..80b4ffed2f 100644 --- a/tests/helpers/test_mkfds.c +++ b/tests/helpers/test_mkfds.c @@ -587,11 +587,16 @@ int main(int argc, char **argv) for (int i = 0; i < factory->N; i++) { char *str = argv[optind + i]; long fd; + char *ep; - errno = 0; - fd = strtol(str, NULL, 10); + errno = 0; + fd = strtol(str, &ep, 10); if (errno) err(EXIT_FAILURE, "failed to convert fd number: %s", str); + if (ep == str) + errx(EXIT_FAILURE, "failed to convert fd number: %s", str); + if (*ep != '\0') + errx(EXIT_FAILURE, _("garbage at the end of number: %s"), str); if (fd < 0) errx(EXIT_FAILURE, "fd number should not be negative: %s", str); if (fd < 3) -- 2.47.3