===================================================================
RCS file: /cvs/texi2mdoc/util.c,v
retrieving revision 1.9
retrieving revision 1.13
diff -u -p -r1.9 -r1.13
--- texi2mdoc/util.c	2015/02/23 14:36:03	1.9
+++ texi2mdoc/util.c	2015/02/24 14:35:40	1.13
@@ -1,4 +1,4 @@
-/*	$Id: util.c,v 1.9 2015/02/23 14:36:03 kristaps Exp $ */
+/*	$Id: util.c,v 1.13 2015/02/24 14:35:40 kristaps Exp $ */
 /*
  * Copyright (c) 2015 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -43,7 +43,10 @@ texifilepop(struct texi *p)
 
 	assert(p->filepos > 0);
 	f = &p->files[--p->filepos];
-	munmap(f->map, f->mapsz);
+	if (TEXISRC_FILE == f->type)
+		munmap(f->map, f->mapsz);
+	else
+		free(f->map);
 }
 
 static void
@@ -157,9 +160,7 @@ texierr(struct texi *p, const char *fmt, ...)
 
 /*
  * Put a single data character to the output if we're not ignoring.
- * Makes sure we don't spurriously start a macro.
- * Adjusts our output status.
- * This shouldn't be called for macros: just for ordinary text.
+ * Escape starting a line with a control character and slashes.
  */
 void
 texiputchar(struct texi *p, char c)
@@ -167,11 +168,14 @@ texiputchar(struct texi *p, char c)
 
 	if (p->ign)
 		return;
-
 	if ('.' == c && 0 == p->outcol)
 		fputs("\\&", stdout);
+	if ('\'' == c && 0 == p->outcol)
+		fputs("\\&", stdout);
 
 	putchar(c);
+	if ('\\' == c)
+		putchar('e');
 	p->seenvs = 0;
 	if ('\n' == c) {
 		p->outcol = 0;
@@ -181,15 +185,22 @@ texiputchar(struct texi *p, char c)
 }
 
 /*
- * Put multiple characters (see texiputchar()).
- * This shouldn't be called for macros: just for ordinary text.
+ * Put an opaque series of characters.
+ * Characters starting a line with a control character are escaped, but
+ * that's it, so don't use this for non-controlled sequences of text.
  */
 void
 texiputchars(struct texi *p, const char *s)
 {
 
-	while ('\0' != *s)
-		texiputchar(p, *s++);
+	if (p->ign)
+		return;
+	if ('.' == *s && 0 == p->outcol)
+		fputs("\\&", stdout);
+	if ('\'' == *s && 0 == p->outcol)
+		fputs("\\&", stdout);
+	p->outcol += fputs(s, stdout);
+	p->seenvs = 0;
 }
 
 /*
@@ -362,9 +373,6 @@ advancenext(struct texi *p, const char *buf, size_t sz
 	
 	if (p->literal) {
 		while (*pos < sz && ismspace(buf[*pos])) {
-			if (*pos && '\n' == buf[*pos] && 
-				'\\' == buf[*pos - 1])
-				texiputchar(p, 'e');
 			texiputchar(p, buf[*pos]);
 			advance(p, buf, pos);
 		}
@@ -419,10 +427,11 @@ static void
 texiexecmacro(struct texi *p, struct teximacro *m,
 	const char *buf, size_t sz, size_t *pos)
 {
-	size_t	  valsz, realsz, aasz, asz, 
-		  ssz, i, j, k, start, end;
-	char	 *val;
-	char	**args;
+	size_t		  valsz, realsz, aasz, asz, 
+			   ssz, i, j, k, start, end;
+	char		 *val;
+	char		**args;
+	const char	 *cp;
 
 	args = argparse(p, buf, sz, pos, &asz, m->argsz);
 	if (asz != m->argsz)
@@ -492,7 +501,10 @@ texiexecmacro(struct texi *p, struct teximacro *m,
 				texiabort(p, NULL);
 		}
 
-		j = strlcat(val, args[k], valsz + 1);
+		for (cp = args[k]; '\0' != *cp; cp++) 
+			val[j++] = *cp;
+
+		val[j] = '\0';
 		i = end;
 	}
 
@@ -946,6 +958,47 @@ parseto(struct texi *p, const char *buf, 
 }
 
 /*
+ * Like parsefile() but used for reading from stdandard input.
+ * This can only be called for the first file!
+ */
+void
+parsestdin(struct texi *p)
+{
+	struct texifile	*f;
+	size_t		 off;
+	ssize_t		 ssz;
+
+	assert(0 == p->filepos);
+	f = &p->files[p->filepos];
+	memset(f, 0, sizeof(struct texifile));
+
+	f->type = TEXISRC_STDIN;
+	f->name = "<stdin>";
+
+	for (off = 0; ; off += (size_t)ssz) {
+		if (off == f->mapsz) {
+			if (f->mapsz == (1U << 31))
+				texierr(p, "stdin buffer too long");
+			f->mapsz = f->mapsz > 65536 / 2 ? 
+				2 * f->mapsz : 65536;
+			f->map = realloc(f->map, f->mapsz);
+			if (NULL == f->map) 
+				texiabort(p, NULL);
+		}
+		ssz = read(STDIN_FILENO, 
+			f->map + (int)off, f->mapsz - off);
+		if (0 == ssz)
+			break;
+		else if (-1 == ssz) 
+			texiabort(p, NULL);
+	}
+
+	p->filepos++;
+	parseeof(p, f->map, off);
+	texifilepop(p);
+}
+
+/*
  * Memory-map the file "fname" and begin parsing it unless "parse" is
  * zero, in which case we just dump the file to stdout (making sure it
  * doesn't trip up mdoc(7) along the way).
@@ -964,6 +1017,7 @@ parsefile(struct texi *p, const char *fname, int parse
 	f = &p->files[p->filepos];
 	memset(f, 0, sizeof(struct texifile));
 
+	f->type = TEXISRC_FILE;
 	f->name = fname;
 	if (-1 == (fd = open(fname, O_RDONLY, 0))) {
 		texiabort(p, fname);
@@ -982,20 +1036,10 @@ parsefile(struct texi *p, const char *fname, int parse
 
 	p->filepos++;
 	if ( ! parse) {
-		/*
-		 * We're printing verbatim output.
-		 * Make sure it doesn't get interpreted as mdoc by
-		 * escaping escapes and making sure leading dots don't
-		 * trigger mdoc(7) expansion.
-		 */
-		for (i = 0; i < f->mapsz; i++) {
-			if (i > 0 && '.' == f->map[i])
-				if ('\n' == f->map[i - 1])
-					fputs("\\&", stdout);
-			putchar(f->map[i]);
-			if ('\\' == f->map[i])
-				putchar('e');
-		}
+		for (i = 0; i < f->mapsz; i++)
+			texiputchar(p, f->map[i]);
+		if (p->outcol)
+			texiputchar(p, '\n');
 	} else
 		parseeof(p, f->map, f->mapsz);
 	texifilepop(p);
@@ -1158,9 +1202,31 @@ argparse(struct texi *p, const char *buf, 
 	args = NULL;
 	*argsz = 0;
 
-	/* Check for no arguments. */
-	if ('{' != buf[*pos])
+	if ('{' != buf[*pos] && hint) {
+		/*
+		 * Special case: if we encounter an unbracketed argument
+		 * and we're being invoked with non-zero arguments
+		 * (versus being set, i.e., hint>0), then parse until
+		 * the end of line.
+		 */
+		*argsz = 1;
+		args = calloc(1, sizeof(char *));
+		if (NULL == args)
+			texiabort(p, NULL);
+		start = *pos;
+		while (*pos < sz) {
+			if ('\n' == buf[*pos])
+				break;
+			advance(p, buf, pos);
+		}
+		args[0] = malloc(*pos - start + 1);
+		memcpy(args[0], &buf[start], *pos - start);
+		args[0][*pos - start] = '\0';
+		if (*pos < sz && '\n' == buf[*pos])
+			advance(p, buf, pos);
 		return(args);
+	} else if ('{' != buf[*pos])
+		return(args);
 
 	/* Parse til the closing '}', putting into the array. */
 	advance(p, buf, pos);
@@ -1194,8 +1260,6 @@ argparse(struct texi *p, const char *buf, 
 		/* Test for zero-length '{  }'. */
 		if (start == end && '}' == buf[*pos] && 0 == *argsz)
 			break;
-		if (start == end)
-			texierr(p, "zero-length argument");
 		/* FIXME: use reallocarray. */
 		args = realloc
 			(args, sizeof(char *) *