Fixed after-NLINE-error assertion.

Scanned over all manuals with valgrind.
Version up.

diff --git a/Makefile b/Makefile
index d588637ab5e22ed2f2595cf9934df15c4c1559b3..cfa6400c17e8e7990bb023cb3924498e62acbde1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ INSTALL_DATA    = install -m 0444
 INSTALL_LIB    = install -m 0644
 INSTALL_MAN    = $(INSTALL_DATA)
 
-VERSION           = 1.7.4
+VERSION           = 1.7.5
 VDATE     = 26 March 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"

diff --git a/man.c b/man.c
index eab8e40042a0e5fe6871498661436170fb4011f6..f0f5b83c889e434981b0cbba6c80170e97bc63fb 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/* $Id: man.c,v 1.11 2009/03/26 14:38:11 kristaps Exp $ */
+/* $Id: man.c,v 1.12 2009/03/26 14:44:41 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -343,7 +343,7 @@ man_pmacro(struct man *m, int ln, char *buf)
                if ( ! man_vwarn(m, ln, ppos, 
                                "ill-formed macro: %s", mac))
                        goto err;
-               goto out;
+               return(1);
        }
        
        if (MAN_MAX == (c = man_hash_find(m->htab, mac))) {
@@ -355,7 +355,7 @@ man_pmacro(struct man *m, int ln, char *buf)
                if ( ! man_vwarn(m, ln, ppos, 
                                "unknown macro: %s", mac))
                        goto err;
-               goto out;
+               return(1);
        }
 
        /* The macro is sane.  Jump to the next word. */

diff --git a/man_term.c b/man_term.c
index d5d95edc94530856da3d95b2c139b3efee2660fa..7d1ff159f1ba51b7a65398222f0072e172f23798 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/* $Id: man_term.c,v 1.1 2009/03/26 14:38:11 kristaps Exp $ */
+/* $Id: man_term.c,v 1.2 2009/03/26 14:44:41 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -25,6 +25,11 @@
 #include "term.h"
 #include "man.h"
 
+#ifdef __linux__
+extern size_t            strlcpy(char *, const char *, size_t);
+extern size_t            strlcat(char *, const char *, size_t);
+#endif
+
 #define        DECL_ARGS         struct termp *p, \
                          const struct man_node *n, \
                          const struct man_meta *m

diff --git a/mdoc_term.c b/mdoc_term.c
index 091c79ce79056eb2595b3de43b25e49ff1412093..ad0e3b2f703730f0abf477cb1b836993a23bc3f6 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_term.c,v 1.1 2009/03/26 14:38:11 kristaps Exp $ */
+/* $Id: mdoc_term.c,v 1.2 2009/03/26 14:44:41 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -306,6 +306,11 @@ static const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* %Q */ 
 };
 
+#ifdef __linux__
+extern size_t            strlcpy(char *, const char *, size_t);
+extern size_t            strlcat(char *, const char *, size_t);
+#endif
+
 static int       arg_hasattr(int, const struct mdoc_node *);
 static int       arg_getattrs(const int *, int *, size_t,
                        const struct mdoc_node *);

diff --git a/terminal.c b/terminal.c
index 315625d2754fb32d0abd98ad183e964d3a1147bf..2c9915345d849e7cea55b7b2dd9b67039438d6c2 100644 (file)
--- a/terminal.c
+++ b/terminal.c
@@ -1,4 +1,4 @@
-/* $Id: terminal.c,v 1.9 2009/03/26 14:38:11 kristaps Exp $ */
+/* $Id: terminal.c,v 1.10 2009/03/26 14:44:41 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -26,11 +26,6 @@
 #include "man.h"
 #include "mdoc.h"
 
-#ifdef __linux__
-extern size_t            strlcpy(char *, const char *, size_t);
-extern size_t            strlcat(char *, const char *, size_t);
-#endif
-
 extern int               man_run(struct termp *, 
                                const struct man *);
 extern int               mdoc_run(struct termp *,