Import strtonum.c because it is not POSIX

diff --git a/Makefile b/Makefile
index fb2bd372f3053a1648873d8311074db475cf0733..a4cb8f937be1f0c262c6a36d463fcca605d4bc93 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ OBJS = tc.o
 OBJS += append.o create.o info.o remove.o
 OBJS += machoparse/cdhash.o cache_from_tree.o sort.o
 OBJS += uuid/gen_uuid.o uuid/pack.o uuid/unpack.o uuid/parse.o uuid/unparse.o uuid/copy.o
+OBJS += compat_strtonum.o
 
 PREFIX ?= ~/.local
 BINDIR ?= $(PREFIX)/bin

diff --git a/append.c b/append.c
index a5cd031116ad954064a2b03040f25c7d821c0c92..184c1ff63ee6c90bf2fea4084db42e5c8dabeebd 100644 (file)
--- a/append.c
+++ b/append.c
@@ -36,6 +36,8 @@
 #include "trustcache.h"
 #include "uuid/uuid.h"
 
+#include "compat.h"
+
 int
 tcappend(int argc, char **argv)
 {

diff --git a/compat.h b/compat.h
new file mode 100644 (file)
index 0000000..87ef8e4
--- /dev/null
+++ b/compat.h
@@ -0,0 +1 @@
+long long strtonum(const char*, long long, long long, const char**);

diff --git a/compat_strtonum.c b/compat_strtonum.c
new file mode 100644 (file)
index 0000000..aa433d8
--- /dev/null
+++ b/compat_strtonum.c
@@ -0,0 +1,68 @@
+/*-
+ * 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.
+ *
+ *     $OpenBSD: strtonum.c,v 1.7 2013/04/17 18:40:58 tedu Exp $
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.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 (errno == EINVAL || 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/info.c b/info.c
index 8de924c475d45b9125ce2849f7dad928e47449d1..86aa78b4799e64f81c39ce5ca3b70a06331939ee 100644 (file)
--- a/info.c
+++ b/info.c
@@ -33,6 +33,8 @@
 
 #include "trustcache.h"
 
+#include "compat.h"
+
 int
 tcinfo(int argc, char **argv)
 {