=================================================================== RCS file: /cvs/mandoc/Attic/xstd.c,v retrieving revision 1.1 retrieving revision 1.10 diff -u -p -r1.1 -r1.10 --- mandoc/Attic/xstd.c 2008/12/23 05:30:49 1.1 +++ mandoc/Attic/xstd.c 2009/03/16 22:19:19 1.10 @@ -1,4 +1,4 @@ -/* $Id: xstd.c,v 1.1 2008/12/23 05:30:49 kristaps Exp $ */ +/* $Id: xstd.c,v 1.10 2009/03/16 22:19:19 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -16,12 +16,17 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include #include #include "private.h" +/* + * Contains wrappers for common functions to simplify their general + * usage throughout this codebase. + */ int xstrcmp(const char *p1, const char *p2) @@ -30,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) { @@ -38,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) { @@ -46,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) @@ -58,7 +69,6 @@ xcalloc(size_t num, size_t sz) return(p); } - char * xstrdup(const char *p) { @@ -69,3 +79,23 @@ xstrdup(const char *p) return(pp); } +int +xstrlcpys(char *buf, const struct mdoc_node *n, size_t sz) +{ + char *p; + + assert(sz > 0); + assert(buf); + *buf = 0; + + 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); + } + + return(1); +}