Some Linux-isms.

5 files changed, 114 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 9df71d30..6c1cbc11 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.6.0
+VERSION	   = 1.6.1
 VDATE	   = 19 March 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
@@ -25,9 +25,9 @@ LIBOBJS	   = macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o \
 LIBSRCS	   = macro.c mdoc.c hash.c strings.c xstd.c argv.c validate.c \
 	     action.c lib.c att.c arch.c vol.c msec.c st.c
 
-MAINLNS	   = main.ln term.ln ascii.ln terminal.ln tree.ln
-MAINOBJS   = main.o term.o ascii.o terminal.o tree.o 
-MAINSRCS   = main.c term.c ascii.c terminal.c tree.c
+MAINLNS	   = main.ln term.ln ascii.ln terminal.ln tree.ln compat.ln
+MAINOBJS   = main.o term.o ascii.o terminal.o tree.o compat.o
+MAINSRCS   = main.c term.c ascii.c terminal.c tree.c compat.c
 
 LLNS	   = llib-llibmdoc.ln llib-lmandoc.ln
 LNS	   = $(MAINLNS) $(LIBLNS)
diff --git a/compat.c b/compat.c
new file mode 100644
index 00000000..8665ffa8
--- /dev/null
+++ b/compat.c
@@ -0,0 +1,90 @@
+/*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * 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 <sys/types.h>
+#include <string.h>
+
+#ifdef __linux__
+
+/*
+ * Appends src to string dst of size siz (unlike strncat, siz is the
+ * full size of dst, not space left).  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
+ * Returns strlen(src) + MIN(siz, strlen(initial dst)).
+ * If retval >= siz, truncation occurred.
+ */
+size_t
+strlcat(char *dst, const char *src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+	size_t dlen;
+
+	/* Find the end of dst and adjust bytes left but don't go past end */
+	while (n-- != 0 && *d != '\0')
+		d++;
+	dlen = d - dst;
+	n = siz - dlen;
+
+	if (n == 0)
+		return(dlen + strlen(s));
+	while (*s != '\0') {
+		if (n != 1) {
+			*d++ = *s;
+			n--;
+		}
+		s++;
+	}
+	*d = '\0';
+
+	return(dlen + (s - src));	/* count does not include NUL */
+}
+
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t
+strlcpy(char *dst, const char *src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+
+	/* Copy as many bytes as will fit */
+	if (n != 0) {
+		while (--n != 0) {
+			if ((*d++ = *s++) == '\0')
+				break;
+		}
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src */
+	if (n == 0) {
+		if (siz != 0)
+			*d = '\0';		/* NUL-terminate dst */
+		while (*s++)
+			;
+	}
+
+	return(s - src - 1);	/* count does not include NUL */
+}
+
+#endif 
diff --git a/main.c b/main.c
index 4571bc2f..188a3732 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.2 2009/03/19 16:18:36 kristaps Exp $ */
+/* $Id: main.c,v 1.3 2009/03/19 16:40:49 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -28,6 +28,13 @@
 
 #include "mdoc.h"
 
+#ifdef __linux__
+extern	int		  getsubopt(char **, char * const *, char **);
+# ifndef __dead
+#  define __dead __attribute__((__noreturn__))
+# endif
+#endif
+
 #define	WARN_WALL	  0x03		/* All-warnings mask. */
 #define	WARN_WCOMPAT	 (1 << 0)	/* Compatibility warnings. */
 #define	WARN_WSYNTAX	 (1 << 1)	/* Syntax warnings. */
diff --git a/terminal.c b/terminal.c
index 9e63d9a9..1b479213 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1,4 +1,4 @@
-/* $Id: terminal.c,v 1.1 2009/03/19 16:17:27 kristaps Exp $ */
+/* $Id: terminal.c,v 1.2 2009/03/19 16:40:49 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -24,6 +24,11 @@
 
 #include "term.h"
 
+#ifdef __linux__
+extern	size_t		  strlcpy(char *, const char *, size_t);
+extern	size_t		  strlcat(char *, const char *, size_t);
+#endif
+
 static	struct termp	 *termp_alloc(enum termenc);
 static	void		  termp_free(struct termp *);
 static	void		  termp_body(struct termp *, struct termpair *,
diff --git a/xstd.c b/xstd.c
index e1e5262d..00cec8bb 100644
--- a/xstd.c
+++ b/xstd.c
@@ -1,4 +1,4 @@
-/* $Id: xstd.c,v 1.11 2009/03/16 23:37:28 kristaps Exp $ */
+/* $Id: xstd.c,v 1.12 2009/03/19 16:40:49 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -23,6 +23,11 @@
 
 #include "private.h"
 
+#ifdef __linux__
+extern	size_t			strlcpy(char *, const char *, size_t);
+extern	size_t			strlcat(char *, const char *, size_t);
+#endif
+
 /*
  * Contains wrappers for common functions to simplify their general
  * usage throughout this codebase.