[hackers] [sbase] Add strtonum() in preparation to nuking estrtol() and friends || sin

From: <git_AT_suckless.org>
Date: Fri, 30 Jan 2015 14:51:27 +0100 (CET)

commit 7cf5cdbffbe7ee3db0c3c4ab6f81d57ab15c44f5
Author: sin <sin_AT_2f30.org>
Date: Fri Jan 30 13:48:33 2015 +0000

    Add strtonum() in preparation to nuking estrtol() and friends

diff --git a/Makefile b/Makefile
index a420784..ff53f08 100644
--- a/Makefile
+++ b/Makefile
_AT_@ -56,6 +56,7 @@ LIBUTILSRC =\
         libutil/strlcat.c\
         libutil/strlcpy.c\
         libutil/strsep.c\
+ libutil/strtonum.c\
         libutil/unescape.c
 
 LIB = $(LIBUTF) $(LIBUTIL)
diff --git a/libutil/strtonum.c b/libutil/strtonum.c
new file mode 100644
index 0000000..7d0b583
--- /dev/null
+++ b/libutil/strtonum.c
_AT_@ -0,0 +1,67 @@
+/* $OpenBSD: strtonum.c,v 1.7 2013/04/17 18:40:58 tedu Exp $ */
+
+/*
+ * Copyright (c) 2004 Ted Unangst and Todd Miller
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+
+#include "../util.h"
+
+#define INVALID 1
+#define TOOSMALL 2
+#define TOOLARGE 3
+
+long long
+strtonum(const char *numstr, long long minval, long long maxval,
+ const char **errstrp)
+{
+ long long ll = 0;
+ int error = 0;
+ char *ep;
+ struct errval {
+ const char *errstr;
+ int err;
+ } ev[4] = {
+ { NULL, 0 },
+ { "invalid", EINVAL },
+ { "too small", ERANGE },
+ { "too large", ERANGE },
+ };
+
+ ev[0].err = errno;
+ errno = 0;
+ if (minval > maxval) {
+ error = INVALID;
+ } else {
+ ll = strtoll(numstr, &ep, 10);
+ if (numstr == ep || *ep != '\0')
+ error = INVALID;
+ else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
+ error = TOOSMALL;
+ else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
+ error = TOOLARGE;
+ }
+ if (errstrp != NULL)
+ *errstrp = ev[error].errstr;
+ errno = ev[error].err;
+ if (error)
+ ll = 0;
+
+ return (ll);
+}
diff --git a/util.h b/util.h
index f32f8b3..458a553 100644
--- a/util.h
+++ b/util.h
_AT_@ -57,4 +57,5 @@ char *humansize(double);
 mode_t parsemode(const char *, mode_t, mode_t);
 void putword(const char *);
 void recurse(const char *, void (*)(const char *));
+long long strtonum(const char *, long long, long long, const char **);
 size_t unescape(char *);
Received on Fri Jan 30 2015 - 14:51:27 CET