mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-05-05 09:54:24 +02:00
f07d3203ad
main/logcheck manual page, logcheck.8, needs to be generated from docbook source. This tool is stable, compact, has no dependencies other than libc, and is written by well respected developers. Other options for generating nroff/troff manual pages from docbook sgml/xml sources are dependency heavy and/or less stable.
106 lines
3.5 KiB
Diff
106 lines
3.5 KiB
Diff
musl doesn't have strtonum, import it from OpenBSD.
|
|
|
|
diff -upr docbook2mdoc-1.1.0.orig/Makefile docbook2mdoc-1.1.0/Makefile
|
|
--- docbook2mdoc-1.1.0.orig/Makefile 2024-06-08 00:28:41.702459845 -0400
|
|
+++ docbook2mdoc-1.1.0/Makefile 2024-06-08 00:29:11.393082807 -0400
|
|
@@ -4,8 +4,8 @@ WWWPREFIX = /var/www/vhosts/mdocml.bsd.l
|
|
PREFIX = /usr/local
|
|
|
|
HEADS = xmalloc.h node.h parse.h reorg.h macro.h format.h
|
|
-SRCS = xmalloc.c node.c parse.c reorg.c macro.c docbook2mdoc.c tree.c main.c
|
|
-OBJS = xmalloc.o node.o parse.o reorg.o macro.o docbook2mdoc.o tree.o main.o
|
|
+SRCS = xmalloc.c node.c parse.c reorg.c macro.c docbook2mdoc.c tree.c main.c strtonum.c
|
|
+OBJS = xmalloc.o node.o parse.o reorg.o macro.o docbook2mdoc.o tree.o main.o strtonum.o
|
|
DISTFILES = Makefile NEWS docbook2mdoc.1
|
|
|
|
all: docbook2mdoc
|
|
diff -upr docbook2mdoc-1.1.0.orig/compat.h docbook2mdoc-1.1.0/compat.h
|
|
--- docbook2mdoc-1.1.0.orig/compat.h 1969-12-31 19:00:00.000000000 -0500
|
|
+++ docbook2mdoc-1.1.0/compat.h 2024-06-08 00:35:42.374609276 -0400
|
|
@@ -0,0 +1,6 @@
|
|
+#ifndef COMPAT_H
|
|
+#define COMPAT_H
|
|
+
|
|
+extern long long strtonum(const char *, long long, long long, const char **);
|
|
+
|
|
+#endif
|
|
diff -upr docbook2mdoc-1.1.0.orig/parse.c docbook2mdoc-1.1.0/parse.c
|
|
--- docbook2mdoc-1.1.0.orig/parse.c 2024-06-08 00:28:41.702459845 -0400
|
|
+++ docbook2mdoc-1.1.0/parse.c 2024-06-08 01:36:18.547430822 -0400
|
|
@@ -31,6 +31,7 @@
|
|
#include "xmalloc.h"
|
|
#include "node.h"
|
|
#include "parse.h"
|
|
+#include "compat.h"
|
|
|
|
/*
|
|
* The implementation of the DocBook parser.
|
|
diff -upr docbook2mdoc-1.1.0.orig/strtonum.c docbook2mdoc-1.1.0/strtonum.c
|
|
--- docbook2mdoc-1.1.0.orig/strtonum.c 1969-12-31 19:00:00.000000000 -0500
|
|
+++ docbook2mdoc-1.1.0/strtonum.c 2024-06-08 00:59:54.578350837 -0400
|
|
@@ -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);
|
|
+}
|