diff options
-rw-r--r-- | include/strutils.h | 1 | ||||
-rw-r--r-- | lib/strutils.c | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/include/strutils.h b/include/strutils.h index bbe299385..aa5ea7cc8 100644 --- a/include/strutils.h +++ b/include/strutils.h @@ -8,6 +8,7 @@ extern int strtosize(const char *str, uintmax_t *res); extern long strtol_or_err(const char *str, const char *errmesg); extern long long strtoll_or_err(const char *str, const char *errmesg); +extern unsigned long strtoul_or_err(const char *str, const char *errmesg); #ifndef HAVE_STRNLEN extern size_t strnlen(const char *s, size_t maxlen); diff --git a/lib/strutils.c b/lib/strutils.c index 07010f32c..e7a2454a0 100644 --- a/lib/strutils.c +++ b/lib/strutils.c @@ -213,6 +213,30 @@ err: errx(EXIT_FAILURE, "%s: '%s'", errmesg, str); return 0; } +/* + * same as strtoul(3) but exit on failure instead of returning crap + */ +unsigned long strtoul_or_err(const char *str, const char *errmesg) +{ + unsigned long num; + char *end = NULL; + + if (str == NULL || *str == '\0') + goto err; + errno = 0; + num = strtoul(str, &end, 10); + + if (errno || str == end || (end && *end)) + goto err; + + return num; +err: + if (errno) + err(EXIT_FAILURE, "%s: '%s'", errmesg, str); + else + errx(EXIT_FAILURE, "%s: '%s'", errmesg, str); + return 0; +} /* * Converts stat->st_mode to ls(1)-like mode string. The size of "str" must |