xbattmon

commit 7b385dcbef0d2d8bff00a2b592dcd20eb69e4dcc
parent 0b1d0982cf468924d84db4fef35d15d51c0024b1
Author: sin <sin@2f30.org>
Date:   Mon, 16 Feb 2015 00:10:40 +0000

Add strtonum()

Diffstat:
M
Makefile
 | 
2
+-
M
config.linux.mk
 | 
2
+-
A
strtonum.c
 | 
67
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
util.h
 | 
2
++
M
xbattmon.c
 | 
3
+--

5 files changed, 72 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ VERSION=0.5.1
 
 include config.mk
 
-OBJ = xbattmon.o
+OBJ = strtonum.o xbattmon.o
 BIN = xbattmon
 
 all: $(BIN)
diff --git a/config.linux.mk b/config.linux.mk
@@ -3,4 +3,4 @@ MANPREFIX = $(PREFIX)/man
 
 CPPFLAGS = -DVERSION=\"${VERSION}\" -DPATH_BAT_CAP=\"/sys/class/power_supply/BAT0/capacity\" \
 	-DPATH_AC_ONLINE=\"/sys/class/power_supply/AC/online\"
-LDLIBS = -lX11 -lbsd
+LDLIBS = -lX11
diff --git a/strtonum.c b/strtonum.c
@@ -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
@@ -0,0 +1,2 @@
+#undef strtonum
+long long strtonum(const char *, long long, long long, const char **);
diff --git a/xbattmon.c b/xbattmon.c
@@ -9,6 +9,7 @@
 #include <string.h>
 
 #include "arg.h"
+#include "util.h"
 
 #define LEN(x) (sizeof(x) / sizeof(*(x)))
 
@@ -188,8 +189,6 @@ pollbat(void)
 	state = info.ac_state == APM_AC_ON ? AC_ON : AC_OFF;
 }
 #elif __linux__
-#include <bsd/stdlib.h>
-
 void
 pollbat(void)
 {