diff options
-rw-r--r-- | include/libbb.h | 1 | ||||
-rw-r--r-- | libbb/Makefile.in | 2 | ||||
-rw-r--r-- | libbb/bb_xgetlarg.c | 28 |
3 files changed, 30 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h index c057ce493..8cb72de8b 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -121,6 +121,7 @@ int recursive_action(const char *fileName, int recurse, int followLinks, int dep | |||
121 | void* userData); | 121 | void* userData); |
122 | 122 | ||
123 | extern int parse_mode( const char* s, mode_t* theMode); | 123 | extern int parse_mode( const char* s, mode_t* theMode); |
124 | extern long bb_xgetlarg(char *arg, int base, long lower, long upper); | ||
124 | 125 | ||
125 | extern int get_kernel_revision(void); | 126 | extern int get_kernel_revision(void); |
126 | 127 | ||
diff --git a/libbb/Makefile.in b/libbb/Makefile.in index 08f8028d9..09c629eca 100644 --- a/libbb/Makefile.in +++ b/libbb/Makefile.in | |||
@@ -43,7 +43,7 @@ LIBBB_SRC:= \ | |||
43 | setup_environment.c simplify_path.c syscalls.c syslog_msg_with_name.c \ | 43 | setup_environment.c simplify_path.c syscalls.c syslog_msg_with_name.c \ |
44 | time_string.c trim.c u_signal_names.c vdprintf.c verror_msg.c \ | 44 | time_string.c trim.c u_signal_names.c vdprintf.c verror_msg.c \ |
45 | vherror_msg.c vperror_msg.c wfopen.c xconnect.c xgetcwd.c xfuncs.c \ | 45 | vherror_msg.c vperror_msg.c wfopen.c xconnect.c xgetcwd.c xfuncs.c \ |
46 | xgethostbyname.c xgethostbyname2.c xreadlink.c xregcomp.c | 46 | xgethostbyname.c xgethostbyname2.c xreadlink.c xregcomp.c bb_xgetlarg.c |
47 | 47 | ||
48 | 48 | ||
49 | LIBBB_OBJS=$(patsubst %.c,$(LIBBB_DIR)%.o, $(LIBBB_SRC)) | 49 | LIBBB_OBJS=$(patsubst %.c,$(LIBBB_DIR)%.o, $(LIBBB_SRC)) |
diff --git a/libbb/bb_xgetlarg.c b/libbb/bb_xgetlarg.c new file mode 100644 index 000000000..598b0b3d6 --- /dev/null +++ b/libbb/bb_xgetlarg.c | |||
@@ -0,0 +1,28 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | ||
2 | /* | ||
3 | * Copyright (C) 2003 Erik Andersen <andersee@debian.org> | ||
4 | */ | ||
5 | |||
6 | |||
7 | #include <stdio.h> | ||
8 | #include <stdlib.h> | ||
9 | #include <getopt.h> | ||
10 | #include <errno.h> | ||
11 | #include <assert.h> | ||
12 | |||
13 | #include "busybox.h" | ||
14 | |||
15 | extern long bb_xgetlarg(char *arg, int base, long lower, long upper) | ||
16 | { | ||
17 | long result; | ||
18 | char *endptr; | ||
19 | int errno_save = errno; | ||
20 | |||
21 | assert(arg!=NULL); | ||
22 | errno = 0; | ||
23 | result = strtol(arg, &endptr, base); | ||
24 | if (errno != 0 || *endptr!='\0' || result < lower || result > upper) | ||
25 | show_usage(); | ||
26 | errno = errno_save; | ||
27 | return result; | ||
28 | } | ||