Further tweaks to make it build on Linuxdev

4 files changed, 73 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 483d4f2..995627a 100644
--- a/Makefile
+++ b/Makefile
@@ -11,4 +11,4 @@ install: pm-fmtdb pm-genid
 	install -m 755 pm $(PREFIX)/bin/pm
 
 clean:
-	rm -f pm-fmtdb
+	rm -f pm-fmtdb pm-genid
diff --git a/compat/strtonum.c b/compat/strtonum.c
new file mode 100644
index 0000000..fdfc72a
--- /dev/null
+++ b/compat/strtonum.c
@@ -0,0 +1,65 @@
+/*	$OpenBSD: strtonum.c,v 1.8 2015/09/13 08:31:48 guenther 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>
+
+#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/pm b/pm
index 3e25fa8..ddaa88d 100755
--- a/pm
+++ b/pm
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2023 Mitchell Riedstra
+# Copyright (c) 2024 Mitchell Riedstra
 # 
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -13,7 +13,7 @@
 # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 set -e
-PASTE_MANAGER_FILE="${PASTE_MANAGER_FILE:-~/.pastes}"
+PASTE_MANAGER_FILE="${PASTE_MANAGER_FILE:-$HOME/.pastes}"
 PASTE_MANAGER_LINES="${PASTE_MANAGER_LINES:-30}"
 PASTE_MANAGER_X_SELECTION="${PASTE_MANAGER_X_SELECTION:-clipboard}"
 
@@ -27,7 +27,7 @@ case $(uname) in
 esac
 
 genid() {
-	if [ -x $(command -v pm-genid) ] ; then
+	if [ -x "$(command -v pm-genid)" ] ; then
 		pm-genid
 		return
 	fi
diff --git a/pm-genid.c b/pm-genid.c
index da4e889..5a481ce 100644
--- a/pm-genid.c
+++ b/pm-genid.c
@@ -22,6 +22,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#if __linux__
+	#include "compat/strtonum.c"
+#endif
+
 #define BUF_SIZE 64
 #define MAX_OUT_CHARS 65534