===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.66
retrieving revision 1.68
diff -u -p -r1.66 -r1.68
--- mandoc/main.c	2010/05/15 05:11:50	1.66
+++ mandoc/main.c	2010/05/15 09:46:31	1.68
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.66 2010/05/15 05:11:50 kristaps Exp $ */
+/*	$Id: main.c,v 1.68 2010/05/15 09:46:31 joerg Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -268,11 +268,31 @@ ffile(const char *file, struct curparse *curp)
 
 
 static int
+resize_buf(struct buf *buf, size_t initial)
+{
+	void *tmp;
+	size_t sz;
+
+	if (buf->sz == 0)
+		sz = initial;
+	else
+		sz = 2 * buf->sz;
+	tmp = realloc(buf->buf, sz);
+	if (NULL == tmp) {
+		perror(NULL);
+		return(0);
+	}
+	buf->buf = tmp;
+	buf->sz = sz;
+	return(1);
+}
+
+
+static int
 read_whole_file(struct curparse *curp, struct buf *fb, int *with_mmap)
 {
 	struct stat	 st;
-	char		*buf;
-	size_t		 sz, off;
+	size_t		 off;
 	ssize_t		 ssz;
 
 	if (-1 == fstat(curp->fd, &st)) {
@@ -319,17 +339,8 @@ read_whole_file(struct curparse *curp, struct buf *fb,
 						curp->file);
 				break;
 			}
-			if (fb->sz == 0)
-				sz = 65536;
-			else
-				sz = 2 * fb->sz;
-			buf = realloc(fb->buf, sz);
-			if (NULL == buf) {
-				perror(NULL);
+			if (! resize_buf(fb, 65536))
 				break;
-			}
-			fb->buf = buf;
-			fb->sz = sz;
 		}
 		ssz = read(curp->fd, fb->buf + off, fb->sz - off);
 		if (ssz == 0) {
@@ -353,13 +364,11 @@ read_whole_file(struct curparse *curp, struct buf *fb,
 static void
 fdesc(struct curparse *curp)
 {
-	size_t		 sz;
 	struct buf	 ln, blk;
 	int		 j, i, pos, lnn, comment, with_mmap;
 	struct man	*man;
 	struct mdoc	*mdoc;
 
-	sz = BUFSIZ;
 	man = NULL;
 	mdoc = NULL;
 	memset(&ln, 0, sizeof(struct buf));
@@ -376,74 +385,68 @@ fdesc(struct curparse *curp)
 	/* Fill buf with file blocksize. */
 
 	for (i = lnn = pos = comment = 0; i < (int)blk.sz; ++i) {
-			if (pos >= (int)ln.sz) {
-				ln.sz += 256; /* Step-size. */
-				ln.buf = realloc(ln.buf, ln.sz);
-				if (NULL == ln.buf) {
-					perror(NULL);
-					goto bailout;
-				}
-			}
+		if (pos >= (int)ln.sz) {
+			if (! resize_buf(&ln, 256))
+				goto bailout;
+		}
 
-			if ('\n' != blk.buf[i]) {
-				if (comment)
-					continue;
-				ln.buf[pos++] = blk.buf[i];
+		if ('\n' != blk.buf[i]) {
+			if (comment)
+				continue;
+			ln.buf[pos++] = blk.buf[i];
 
-				/* Handle in-line `\"' comments. */
+			/* Handle in-line `\"' comments. */
 
-				if (1 == pos || '\"' != ln.buf[pos - 1])
-					continue;
+			if (1 == pos || '\"' != ln.buf[pos - 1])
+				continue;
 
-				for (j = pos - 2; j >= 0; j--)
-					if ('\\' != ln.buf[j])
-						break;
+			for (j = pos - 2; j >= 0; j--)
+				if ('\\' != ln.buf[j])
+					break;
 
-				if ( ! ((pos - 2 - j) % 2))
-					continue;
-
-				comment = 1;
-				pos -= 2;
-				for (; pos > 0; --pos) {
-					if (ln.buf[pos - 1] != ' ')
-						break;
-					if (pos > 2 && ln.buf[pos - 2] == '\\')
-						break;
-				}
+			if ( ! ((pos - 2 - j) % 2))
 				continue;
-			} 
 
-			/* Handle escaped `\\n' newlines. */
+			comment = 1;
+			pos -= 2;
+			for (; pos > 0; --pos) {
+				if (ln.buf[pos - 1] != ' ')
+					break;
+				if (pos > 2 && ln.buf[pos - 2] == '\\')
+					break;
+			}
+			continue;
+		} 
 
-			if (pos > 0 && 0 == comment && 
-					'\\' == ln.buf[pos - 1]) {
-				for (j = pos - 1; j >= 0; j--)
-					if ('\\' != ln.buf[j])
-						break;
-				if ( ! ((pos - j) % 2)) {
-					pos--;
-					lnn++;
-					continue;
-				}
+		/* Handle escaped `\\n' newlines. */
+
+		if (pos > 0 && 0 == comment && '\\' == ln.buf[pos - 1]) {
+			for (j = pos - 1; j >= 0; j--)
+				if ('\\' != ln.buf[j])
+					break;
+			if ( ! ((pos - j) % 2)) {
+				pos--;
+				lnn++;
+				continue;
 			}
+		}
 
-			ln.buf[pos] = 0;
-			lnn++;
+		ln.buf[pos] = 0;
+		lnn++;
 
-			/* If unset, assign parser in pset(). */
+		/* If unset, assign parser in pset(). */
 
-			if ( ! (man || mdoc) && ! pset(ln.buf, 
-						pos, curp, &man, &mdoc))
-				goto bailout;
+		if ( ! (man || mdoc) && ! pset(ln.buf, pos, curp, &man, &mdoc))
+			goto bailout;
 
-			pos = comment = 0;
+		pos = comment = 0;
 
-			/* Pass down into parsers. */
+		/* Pass down into parsers. */
 
-			if (man && ! man_parseln(man, lnn, ln.buf))
-				goto bailout;
-			if (mdoc && ! mdoc_parseln(mdoc, lnn, ln.buf))
-				goto bailout;
+		if (man && ! man_parseln(man, lnn, ln.buf))
+			goto bailout;
+		if (mdoc && ! mdoc_parseln(mdoc, lnn, ln.buf))
+			goto bailout;
 	}
 
 	/* NOTE a parser may not have been assigned, yet. */