From 499f4d45d3cd7185d59e648c218a6e5c74f2ada7 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Tue, 21 May 2013 12:56:54 +0200
Subject: [PATCH] libite: Add strtonum() from OpenBSD

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 Makefile   |  3 ++-
 lite.h     |  4 ++++
 strtonum.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 strtonum.c

diff --git a/Makefile b/Makefile
index c8afb7b..43f85a4 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,8 @@ include  ../common.mk
 
 CFLAGS     += -fPIC
 HEADERS     = lite.h
-OBJS       := copyfile.o dir.o fexist.o fisdir.o fmode.o rsync.o strlcpy.o strlcat.o
+OBJS       := copyfile.o dir.o fexist.o fisdir.o fmode.o rsync.o
+OBJS       += strlcpy.o strlcat.o strtonum.o
 DEPS       := $(addprefix ., $(OBJS:.o=.d))
 
 VER         = 0
diff --git a/lite.h b/lite.h
index e08e944..bffddcf 100644
--- a/lite.h
+++ b/lite.h
@@ -48,6 +48,10 @@ size_t  strlcpy    (char *dst, const char *src, size_t siz);
 #ifndef strlcat
 size_t  strlcat    (char *dst, const char *src, size_t siz);
 #endif
+#ifndef strtonum
+long long strtonum (const char *numstr, long long minval, long long maxval, const char **errstrp);
+#endif
+
 static inline int fisslashdir(char *dir)
 {
    if (!dir)             return 0;
diff --git a/strtonum.c b/strtonum.c
new file mode 100644
index 0000000..73ebdbe
--- /dev/null
+++ b/strtonum.c
@@ -0,0 +1,67 @@
+/*	$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 <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+
+#ifndef strtonum
+#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;
+	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);
+}
+#endif