Fixed after-NLINE-error assertion.

Scanned over all manuals with valgrind.
Version up.

5 files changed, 13 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index d588637a..cfa6400c 100644
--- 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 18f03be3..57b79900 100644
--- a/man.c
+++ b/man.c
@@ -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 0a8e5fce..df750e07 100644
--- a/man_term.c
+++ b/man_term.c
@@ -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 71124804..8551608e 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -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 f2048cd5..e77b7a63 100644
--- a/terminal.c
+++ b/terminal.c
@@ -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 *,