flock: use strutils.h to check numeric user input

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am
index c05a0e7e3a5241acdf6b9578af74c02a333ff014..13c79c4dfbca4686fe5d924d982cc944bdb705ba 100644 (file)
--- a/sys-utils/Makefile.am
+++ b/sys-utils/Makefile.am
@@ -40,6 +40,7 @@ rtcwake_SOURCES = rtcwake.c $(top_srcdir)/lib/strutils.c
 dmesg_SOURCES = dmesg.c $(top_srcdir)/lib/strutils.c
 ipcmk_SOURCES = ipcmk.c $(top_srcdir)/lib/strutils.c
 ipcrm_SOURCES = ipcrm.c  $(top_srcdir)/lib/strutils.c
+flock_SOURCES = flock.c $(top_srcdir)/lib/strutils.c
 
 if BUILD_MOUNTPOINT
 bin_PROGRAMS += mountpoint

diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index 03eec365e17605b88022482678c3df632373c72b..cdfa6cfb175e96bf4bf6386dfe352a85a210175f 100644 (file)
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -41,6 +41,7 @@
 
 #include "c.h"
 #include "nls.h"
+#include "strutils.h"
 
 static void __attribute__((__noreturn__)) usage(int ex)
 {
@@ -217,10 +218,7 @@ int main(int argc, char *argv[])
                }
        } else if (optind < argc) {
                /* Use provided file descriptor */
-               fd = (int)strtol(argv[optind], &eon, 10);
-               if (*eon || !argv[optind]) {
-                       errx(EX_USAGE, _("bad number: %s"), argv[optind]);
-               }
+               fd = (int)strtol_or_err(argv[optind], "bad number");
        } else {
                /* Bad options */
                errx(EX_USAGE, _("requires file descriptor, file or directory"));