ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

flock: use strutils.h to check numeric user input 

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-09-21 22:26:05 +02:00
parent 56d45cfabe
commit 37bb0ce812
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys-utils/Makefile.am
View File

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

6
sys-utils/flock.c
View File

@ -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"));