[canopy-httpd] r1107 committed - add cnp_strtonum(), same as OpenBSD's strtonum()

[codesite...@google.com]

Revision: 1107
Author: phrakt
Date: Fri Dec 3 16:28:26 2010
Log: add cnp_strtonum(), same as OpenBSD's strtonum()

http://code.google.com/p/canopy-httpd/source/detail?r=1107

Added:
/trunk/src/lib/canopy/strtonum.c
Modified:
/trunk/src/lib/canopy/Makefile
/trunk/src/lib/canopy/string.h

=======================================
--- /dev/null
+++ /trunk/src/lib/canopy/strtonum.c Fri Dec 3 16:28:26 2010
@@ -0,0 +1,70 @@
+/* $Id$ */
+/* $OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert 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 <sys/types.h>
+
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+
+#include "string.h"
+
+
+#define INVALID 1
+#define TOOSMALL 2
+#define TOOLARGE 3
+
+long long
+cnp_strtonum(const char *numstr, long long minval, long long maxval,
+ const char **errstrp)
+{
+ long long ll = 0;
+ char *ep;
+ int error = 0;
+ 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);
+}
=======================================
--- /trunk/src/lib/canopy/Makefile Thu Apr 22 21:05:51 2010
+++ /trunk/src/lib/canopy/Makefile Fri Dec 3 16:28:26 2010
@@ -6,8 +6,8 @@

SRCS= base64.c buf.c canopy.c cond.c conf.y error.c fnv.c htab.c log.c
md5.c \
- mem.c mib.c mutex.c queue.c rwlock.c signal.c string.c thread.c \
- thrpool.c
+ mem.c mib.c mutex.c queue.c rwlock.c signal.c string.c strtonum.c \
+ thread.c thrpool.c

.if ${OS} == "Linux"
SRCS+= strlcat.c strlcpy.c
=======================================
--- /trunk/src/lib/canopy/string.h Sun May 2 13:52:55 2010
+++ /trunk/src/lib/canopy/string.h Fri Dec 3 16:28:26 2010
@@ -43,12 +43,13 @@

-char* cnp_strdup (const char *);
-char* cnp_strndup (const char *, size_t);
-char* cnp_strnrchr (const char *, size_t, int);
-
-int cnp_asprintf (char **, const char *, ...) ATTR_FORMAT(2, 3);
-int cnp_vasprintf (char **, const char *, va_list) ATTR_FORMAT(2, 0);
-
+char* cnp_strdup (const char *);
+char* cnp_strndup (const char *, size_t);
+char* cnp_strnrchr (const char *, size_t, int);
+
+int cnp_asprintf (char **, const char *, ...) ATTR_FORMAT(2, 3);
+int cnp_vasprintf (char **, const char *, va_list) ATTR_FORMAT(2, 0);
+
+long long cnp_strtonum (const char *, long long, long long, const char
**);

#endif /* _CANOPY_STRING_H_ */