diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | defs.h | 10 | ||||
| -rw-r--r-- | string_to_uint.c | 69 | ||||
| -rw-r--r-- | string_to_uint.h | 44 | ||||
| -rw-r--r-- | util.c | 32 |
5 files changed, 116 insertions, 41 deletions
diff --git a/Makefile.am b/Makefile.am index 2a477f688..53115cd56 100644 --- a/Makefile.am +++ b/Makefile.am @@ -284,6 +284,8 @@ strace_SOURCES = \ statx.c \ statx.h \ strace.c \ + string_to_uint.h \ + string_to_uint.c \ swapon.c \ syscall.c \ sysctl.c \ @@ -58,6 +58,7 @@ #include "kernel_types.h" #include "macros.h" #include "mpers_type.h" +#include "string_to_uint.h" #include "sysent.h" #include "xmalloc.h" @@ -510,15 +511,6 @@ void dyxlat_add_pair(struct dyxlat *, uint64_t val, const char *str, size_t len) const struct xlat *genl_families_xlat(void); extern unsigned long get_pagesize(void); -extern int -string_to_uint_ex(const char *str, char **endptr, - unsigned int max_val, const char *accepted_ending); -extern int string_to_uint(const char *str); -static inline int -string_to_uint_upto(const char *const str, unsigned int max_val) -{ - return string_to_uint_ex(str, NULL, max_val, NULL); -} extern int next_set_bit(const void *bit_array, unsigned cur_bit, unsigned size_bits); /* diff --git a/string_to_uint.c b/string_to_uint.c new file mode 100644 index 000000000..223f68ad8 --- /dev/null +++ b/string_to_uint.c @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2001-2017 The strace developers. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <errno.h> +#include <limits.h> +#include <stdlib.h> +#include <string.h> + +#include "string_to_uint.h" + +int +string_to_uint_ex(const char *const str, char **const endptr, + const unsigned int max_val, const char *const accepted_ending) +{ + char *end; + long val; + + if (!*str) + return -1; + + errno = 0; + val = strtol(str, &end, 10); + + if (str == end || val < 0 || (unsigned long) val > max_val + || (val == LONG_MAX && errno == ERANGE)) + return -1; + + if (*end && (!accepted_ending || !strchr(accepted_ending, *end))) + return -1; + + if (endptr) + *endptr = end; + + return (int) val; +} + +int +string_to_uint(const char *const str) +{ + return string_to_uint_upto(str, INT_MAX); +} diff --git a/string_to_uint.h b/string_to_uint.h new file mode 100644 index 000000000..6d26776fd --- /dev/null +++ b/string_to_uint.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2001-2017 The strace developers. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef STRACE_STRING_TO_UINT_H +#define STRACE_STRING_TO_UINT_H + +extern int +string_to_uint(const char *str); + +extern int +string_to_uint_ex(const char *str, char **endptr, + unsigned int max_val, const char *accepted_ending); + +static inline int +string_to_uint_upto(const char *const str, const unsigned int max_val) +{ + return string_to_uint_ex(str, NULL, max_val, NULL); +} + +#endif /* !STRACE_STRING_TO_UINT_H */ @@ -42,38 +42,6 @@ #include <sys/uio.h> int -string_to_uint_ex(const char *const str, char **const endptr, - const unsigned int max_val, const char *const accepted_ending) -{ - char *end; - long val; - - if (!*str) - return -1; - - errno = 0; - val = strtol(str, &end, 10); - - if (str == end || val < 0 || (unsigned long) val > max_val - || (val == LONG_MAX && errno == ERANGE)) - return -1; - - if (*end && (!accepted_ending || !strchr(accepted_ending, *end))) - return -1; - - if (endptr) - *endptr = end; - - return (int) val; -} - -int -string_to_uint(const char *const str) -{ - return string_to_uint_upto(str, INT_MAX); -} - -int tv_nz(const struct timeval *a) { return a->tv_sec || a->tv_usec; |