===================================================================
RCS file: /cvs/mandoc/Attic/xstd.c,v
retrieving revision 1.2
retrieving revision 1.11
diff -u -p -r1.2 -r1.11
--- mandoc/Attic/xstd.c	2008/12/29 18:08:44	1.2
+++ mandoc/Attic/xstd.c	2009/03/16 23:37:28	1.11
@@ -1,6 +1,6 @@
-/* $Id: xstd.c,v 1.2 2008/12/29 18:08:44 kristaps Exp $ */
+/* $Id: xstd.c,v 1.11 2009/03/16 23:37:28 kristaps Exp $ */
 /*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the
@@ -16,18 +16,18 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#include <assert.h>
 #include <err.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "private.h"
 
-#ifdef __linux__
-extern	size_t		 strlcat(char *, const char *, size_t);
-extern	size_t		 strlcpy(char *, const char *, size_t);
-#endif
+/*
+ * Contains wrappers for common functions to simplify their general
+ * usage throughout this codebase.
+ */
 
-
 int
 xstrcmp(const char *p1, const char *p2)
 {
@@ -35,7 +35,6 @@ xstrcmp(const char *p1, const char *p2)
 	return(0 == strcmp(p1, p2));
 }
 
-
 int
 xstrlcat(char *dst, const char *src, size_t sz)
 {
@@ -43,7 +42,6 @@ xstrlcat(char *dst, const char *src, size_t sz)
 	return(strlcat(dst, src, sz) < sz);
 }
 
-
 int
 xstrlcpy(char *dst, const char *src, size_t sz)
 {
@@ -51,7 +49,15 @@ xstrlcpy(char *dst, const char *src, size_t sz)
 	return(strlcpy(dst, src, sz) < sz);
 }
 
+void *
+xrealloc(void *ptr, size_t sz)
+{
+	void		*p;
 
+	if (NULL == (p = realloc(ptr, sz)))
+		err(EXIT_FAILURE, "realloc");
+	return(p);
+}
 
 void *
 xcalloc(size_t num, size_t sz)
@@ -63,7 +69,6 @@ xcalloc(size_t num, size_t sz)
 	return(p);
 }
 
-
 char *
 xstrdup(const char *p)
 {
@@ -74,82 +79,23 @@ xstrdup(const char *p)
 	return(pp);
 }
 
-
-#ifdef __linux__
-/*	$OpenBSD: xstd.c,v 1.2 2008/12/29 18:08:44 kristaps 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>
-
-
-size_t
-strlcat(char *dst, const char *src, size_t siz)
+int
+xstrlcpys(char *buf, const struct mdoc_node *n, size_t sz)
 {
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
-	size_t dlen;
+	char		 *p;
 
-	/* 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;
+	assert(sz > 0);
+	assert(buf);
+	*buf = 0;
 
-	if (n == 0)
-		return(dlen + strlen(s));
-	while (*s != '\0') {
-		if (n != 1) {
-			*d++ = *s;
-			n--;
-		}
-		s++;
+	for ( ; n; n = n->next) {
+		assert(MDOC_TEXT == n->type);
+		p = n->string;
+		if ( ! xstrlcat(buf, p, sz))
+			return(0);
+		if (n->next && ! xstrlcat(buf, " ", sz))
+			return(0);
 	}
-	*d = '\0';
 
-	return(dlen + (s - src));	/* count does not include NUL */
+	return(1);
 }
-
-
-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