[src/trunk]: src/lib/libc/stdlib Add strtonum implemented as a wrapper of str...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1e7e4c29d3f5
branches:  trunk
changeset: 805736:1e7e4c29d3f5
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jan 16 18:41:33 2015 +0000

description:
Add strtonum implemented as a wrapper of strtoi.

diffstat:

 lib/libc/stdlib/Makefile.inc |   4 +-
 lib/libc/stdlib/strtonum.c   |  67 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 2 deletions(-)

diffs (89 lines):

diff -r 19f66fd9abfa -r 1e7e4c29d3f5 lib/libc/stdlib/Makefile.inc
--- a/lib/libc/stdlib/Makefile.inc      Fri Jan 16 18:40:16 2015 +0000
+++ b/lib/libc/stdlib/Makefile.inc      Fri Jan 16 18:41:33 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.84 2015/01/16 18:37:21 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.85 2015/01/16 18:41:33 christos Exp $
 #      from: @(#)Makefile.inc  8.3 (Berkeley) 2/4/95
 
 # stdlib sources
@@ -13,7 +13,7 @@
        nrand48.c putenv.c qabs.c qdiv.c qsort.c posix_openpt.c pty.c \
        quick_exit.c radixsort.c rand.c rand_r.c random.c remque.c \
        seed48.c setenv.c srand48.c strsuftoll.c \
-       strtoi.c strtou.c \
+       strtoi.c strtou.c strtonum.c \
        strtoimax.c strtol.c strtoll.c strtoq.c strtoul.c strtoull.c \
        strtoumax.c strtouq.c system.c tdelete.c tfind.c tsearch.c twalk.c \
        unsetenv.c strfmon.c
diff -r 19f66fd9abfa -r 1e7e4c29d3f5 lib/libc/stdlib/strtonum.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libc/stdlib/strtonum.c        Fri Jan 16 18:41:33 2015 +0000
@@ -0,0 +1,67 @@
+/*     $NetBSD: strtonum.c,v 1.1 2015/01/16 18:41:33 christos Exp $    */
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: strtonum.c,v 1.1 2015/01/16 18:41:33 christos Exp $");
+
+#define _OPENBSD_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <inttypes.h>
+
+/*
+ * Problems with the strtonum(3) API:
+ *   - will return 0 on failure; 0 might not be in range, so
+ *     that necessitates an error check even if you want to avoid it.
+ *   - does not differentiate 'illegal' returns, so we can't tell
+ *     the difference between partial and no conversions.
+ *   - returns english strings
+ *   - can't set the base, or find where the conversion ended
+ */
+long long
+strtonum(const char * __restrict ptr, long long lo, long long hi,
+    const char ** __restrict res)
+{
+       int e;
+       intmax_t rv;
+       const char *resp;
+
+       if (res == NULL)
+               res = &resp;
+
+       rv = strtoi(ptr, NULL, 0, lo, hi, &e);
+       if (e == 0) {
+               *res = NULL;
+               return rv;
+       }
+       *res = e != ERANGE ? "invalid" : (rv == hi ? "too large" : "too small");
+       return 0;
+}