=================================================================== RCS file: /cvs/mandoc/mdoc_validate.c,v retrieving revision 1.201 retrieving revision 1.204 diff -u -p -r1.201 -r1.204 --- mandoc/mdoc_validate.c 2014/01/07 09:10:45 1.201 +++ mandoc/mdoc_validate.c 2014/03/23 12:11:18 1.204 @@ -1,4 +1,4 @@ -/* $Id: mdoc_validate.c,v 1.201 2014/01/07 09:10:45 schwarze Exp $ */ +/* $Id: mdoc_validate.c,v 1.204 2014/03/23 12:11:18 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010-2014 Ingo Schwarze @@ -36,6 +36,7 @@ #include "mdoc.h" #include "mandoc.h" +#include "mandoc_aux.h" #include "libmdoc.h" #include "libmandoc.h" @@ -1894,7 +1895,7 @@ post_hyph(POST_ARGS) if (MDOC_TEXT != nch->type) continue; cp = nch->string; - if (3 > strnlen(cp, 3)) + if ('\0' == *cp) continue; while ('\0' != *(++cp)) if ('-' == *cp && @@ -2394,11 +2395,9 @@ post_os(POST_ARGS) if (-1 == uname(&utsname)) { mdoc_nmsg(mdoc, n, MANDOCERR_UNAME); defbuf = mandoc_strdup("UNKNOWN"); - } else if (-1 == asprintf(&defbuf, "%s %s", - utsname.sysname, utsname.release)) { - perror(NULL); - exit((int)MANDOCLEVEL_SYSERR); - } + } else + mandoc_asprintf(&defbuf, "%s %s", + utsname.sysname, utsname.release); } mdoc->meta.os = mandoc_strdup(defbuf); #endif /*!OSNAME*/