Added man validator, renamed mdoc validator.

[mandoc.git] / xstd.c

diff --git a/xstd.c b/xstd.c
index 8b2ec4e94e5c0fa3f1fb72d28e87f5570c7aae84..c22a0ff2ecd9a2c4e14aa237b54c50e75fd5f799 100644 (file)
--- a/xstd.c
+++ b/xstd.c
@@ -1,6 +1,6 @@
-/* $Id: xstd.c,v 1.9 2009/03/08 19:47:41 kristaps Exp $ */
+/* $Id: xstd.c,v 1.13 2009/03/23 14:22:11 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
@@ -21,19 +21,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "private.h"
+#include "libmdoc.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.
  */
 
-#ifdef __linux__
-extern size_t           strlcat(char *, const char *, size_t);
-extern size_t           strlcpy(char *, const char *, size_t);
-#endif
-
-
 int
 xstrcmp(const char *p1, const char *p2)
 {
@@ -65,15 +64,6 @@ xrealloc(void *ptr, size_t sz)
        return(p);
 }
 
-void *
-xcalloc(size_t num, size_t sz)
-{
-       void            *p;
-
-       if (NULL == (p = calloc(num, sz)))
-               err(EXIT_FAILURE, "calloc");
-       return(p);
-}
 
 char *
 xstrdup(const char *p)
@@ -105,81 +95,3 @@ xstrlcpys(char *buf, const struct mdoc_node *n, size_t sz)
 
        return(1);
 }
-
-#ifdef __linux__
-/*     $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>
-
-
-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 */
-}
-
-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