===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.114
retrieving revision 1.119
diff -u -p -r1.114 -r1.119
--- mandoc/term.c	2009/10/27 08:05:39	1.114
+++ mandoc/term.c	2009/10/30 18:53:09	1.119
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.114 2009/10/27 08:05:39 kristaps Exp $ */
+/*	$Id: term.c,v 1.119 2009/10/30 18:53:09 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -77,9 +76,11 @@ term_alloc(enum termenc enc)
 {
 	struct termp *p;
 
-	if (NULL == (p = malloc(sizeof(struct termp))))
-		return(NULL);
-	bzero(p, sizeof(struct termp));
+	p = calloc(1, sizeof(struct termp));
+	if (NULL == p) {
+		fprintf(stderr, "memory exhausted\n");
+		exit(EXIT_FAILURE);
+	}
 	p->maxrmargin = 78;
 	p->enc = enc;
 	return(p);
@@ -139,17 +140,25 @@ term_flushln(struct termp *p)
 	 * First, establish the maximum columns of "visible" content.
 	 * This is usually the difference between the right-margin and
 	 * an indentation, but can be, for tagged lists or columns, a
-	 * small set of values.
+	 * small set of values. 
 	 */
 
 	assert(p->offset < p->rmargin);
 
 	maxvis = (int)(p->rmargin - p->offset) - overstep < 0 ?
-			0 : p->rmargin - p->offset - overstep;
+		/* LINTED */ 
+		0 : p->rmargin - p->offset - overstep;
 	mmax = (int)(p->maxrmargin - p->offset) - overstep < 0 ?
-			0 : p->maxrmargin - p->offset - overstep;
+		/* LINTED */
+		0 : p->maxrmargin - p->offset - overstep;
 
 	bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
+
+	/* 
+	 * FIXME: if bp is zero, we still output the first word before
+	 * breaking the line.
+	 */
+
 	vis = 0;
 
 	/*
@@ -535,8 +544,10 @@ buffer(struct termp *p, char c)
 			p->maxcols = 256;
 		s = p->maxcols * 2;
 		p->buf = realloc(p->buf, s);
-		if (NULL == p->buf)
-			err(1, "realloc"); /* FIXME: shouldn't be here! */
+		if (NULL == p->buf) {
+			fprintf(stderr, "memory exhausted\n");
+			exit(EXIT_FAILURE);
+		}
 		p->maxcols = s;
 	}
 	p->buf[(int)(p->col)++] = c;