From: Lennart Poettering Date: Wed, 18 Nov 2009 23:46:47 +0000 (+0100) Subject: util: add parsers for boolean and integers X-Git-Tag: v1~859 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=852618039bea9f6fa851a0ae3101f79b65d3cf6b;hp=e1cc7a01bb4663b4aea307cf22368bb5568a9e46 util: add parsers for boolean and integers --- diff --git a/util.c b/util.c index 3ef190fa2..bcb608480 100644 --- a/util.c +++ b/util.c @@ -4,6 +4,7 @@ #include #include #include +#include #include "macro.h" #include "util.h" @@ -93,3 +94,54 @@ int nointr_close(int fd) { return r; } } + +int parse_boolean(const char *v) { + assert(v); + + if (!strcmp(v, "1") || v[0] == 'y' || v[0] == 'Y' || v[0] == 't' || v[0] == 'T' || !strcasecmp(v, "on")) + return 1; + else if (!strcmp(v, "0") || v[0] == 'n' || v[0] == 'N' || v[0] == 'f' || v[0] == 'F' || !strcasecmp(v, "off")) + return 0; + + return -EINVAL; +} + +int safe_atou(const char *s, unsigned *ret_u) { + char *x = NULL; + unsigned l; + + assert(s); + assert(ret_u); + + errno = 0; + l = strtoul(s, &x, 0); + + if (!x || *x || errno) + return errno ? -errno : -EINVAL; + + if ((unsigned) l != l) + return -ERANGE; + + *ret_u = (unsigned) l; + return 0; +} + +int safe_atoi(const char *s, int *ret_i) { + char *x = NULL; + int l; + + assert(s); + assert(ret_i); + + errno = 0; + l = strtol(s, &x, 0); + + if (!x || *x || errno) + return errno ? -errno : -EINVAL; + + if ((int) l != l) + return -ERANGE; + + *ret_i = (unsigned) l; + return 0; +} diff --git a/util.h b/util.h index 5d9ef39e0..2df67b73d 100644 --- a/util.h +++ b/util.h @@ -46,4 +46,9 @@ bool startswith(const char *s, const char *prefix); int nointr_close(int fd); +int parse_boolean(const char *v); + +int safe_atou(const char *s, unsigned *ret_u); +int safe_atoi(const char *s, int *ret_i); + #endif