===================================================================
RCS file: /cvs/mandoc/Attic/argv.c,v
retrieving revision 1.39
retrieving revision 1.49
diff -u -p -r1.39 -r1.49
--- mandoc/Attic/argv.c	2009/03/08 11:41:22	1.39
+++ mandoc/Attic/argv.c	2009/03/12 02:57:35	1.49
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.39 2009/03/08 11:41:22 kristaps Exp $ */
+/* $Id: argv.c,v 1.49 2009/03/12 02:57:35 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -16,6 +16,8 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
@@ -207,6 +209,13 @@ static	int mdoc_argflags[MDOC_MAX] = {
 	0, /* Fr */
 	0, /* Ud */
 	0, /* Lb */
+	0, /* Ap */
+	ARGS_DELIM, /* Lp */
+	ARGS_DELIM | ARGS_QUOTED, /* Lk */
+	ARGS_DELIM | ARGS_QUOTED, /* Mt */
+	ARGS_DELIM, /* Brq */
+	0, /* Bro */
+	ARGS_DELIM, /* Brc */
 };
 
 
@@ -220,7 +229,7 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
 		struct mdoc_arg **v, int *pos, char *buf)
 {
 	int		  i;
-	char		 *p;
+	char		 *p, sv;
 	struct mdoc_argv tmp;
 	struct mdoc_arg	 *arg;
 
@@ -245,8 +254,17 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
 		(*pos)++;
 	}
 
-	if (buf[*pos])
+	/* 
+	 * XXX: save the nullified byte as we'll restore it if this
+	 * doesn't end up being a command after all.  This is a little
+	 * bit hacky.  I don't like it, but it works for now.
+	 */
+
+	sv = 0;
+	if (buf[*pos]) {
+		sv = buf[*pos];
 		buf[(*pos)++] = 0;
+	}
 
 	(void)memset(&tmp, 0, sizeof(struct mdoc_argv));
 	tmp.line = line;
@@ -259,6 +277,9 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
 	 */
 
 	if (MDOC_ARG_MAX == (tmp.arg = argv_a2arg(tok, p))) {
+		/* XXX - restore saved byte. */
+		if (sv)
+			buf[*pos - 1] = sv;
 		if ( ! pwarn(mdoc, line, i, WARGVPARM))
 			return(ARGV_ERROR);
 		return(ARGV_WORD);
@@ -273,13 +294,13 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
 		return(ARGV_ERROR);
 
 	if (NULL == (arg = *v)) {
-		v = xcalloc(1, sizeof(struct mdoc_arg));
+		*v = xcalloc(1, sizeof(struct mdoc_arg));
 		arg = *v;
-	}
+	} 
 
 	arg->argc++;
 	arg->argv = xrealloc(arg->argv, arg->argc * 
-			sizeof(struct mdoc_arg));
+			sizeof(struct mdoc_argv));
 
 	(void)memcpy(&arg->argv[(int)arg->argc - 1], 
 			&tmp, sizeof(struct mdoc_argv));
@@ -293,9 +314,17 @@ mdoc_argv_free(struct mdoc_arg *p)
 {
 	int		 i, j;
 
-	if (p->refcnt && --(p->refcnt) > 0)
+	if (NULL == p)
 		return;
 
+	if (p->refcnt) {
+		--(p->refcnt);
+		if (p->refcnt)
+			return;
+	}
+
+	assert(p->argc);
+
 	/* LINTED */
 	for (i = 0; i < (int)p->argc; i++) {
 		if (0 == p->argv[i].sz)
@@ -303,11 +332,11 @@ mdoc_argv_free(struct mdoc_arg *p)
 		/* LINTED */
 		for (j = 0; j < (int)p->argv[i].sz; j++)
 			free(p->argv[i].value[j]);
+
 		free(p->argv[i].value);
 	}
 
-	if (p->argc)
-		free(p->argv);
+	free(p->argv);
 	free(p);
 }
 
@@ -547,7 +576,7 @@ args(struct mdoc *mdoc, int line, 
 					return(0);
 
 			if (p)
-				return(ARGS_WORD);
+				return(ARGS_PHRASE);
 
 			/* Configure the eoln case, too. */
 
@@ -559,9 +588,9 @@ args(struct mdoc *mdoc, int line, 
 					return(0);
 			*pos += (int)(p - *v);
 
-			return(ARGS_WORD);
+			return(ARGS_PHRASE);
 		} 
-
+		
 		/* Do non-tabsep look-ahead here. */
 		
 		if ( ! (ARGS_TABSEP & fl))
@@ -659,6 +688,8 @@ argv_a2arg(int tok, const char *argv)
 			return(MDOC_File);
 		else if (xstrcmp(argv, "offset"))
 			return(MDOC_Offset);
+		else if (xstrcmp(argv, "compact"))
+			return(MDOC_Compact);
 		break;
 
 	case (MDOC_Bf):
@@ -742,7 +773,7 @@ argv_multi(struct mdoc *mdoc, int line, 
 			v->value = xrealloc(v->value, 
 				(v->sz + 5) * sizeof(char *));
 
-		v->value[(int)v->sz] = p;
+		v->value[(int)v->sz] = xstrdup(p);
 	}
 
 	if (v->sz)
@@ -770,7 +801,7 @@ argv_opt_single(struct mdoc *mdoc, int line, 
 
 	v->sz = 1;
 	v->value = xcalloc(1, sizeof(char *));
-	v->value[0] = p;
+	v->value[0] = xstrdup(p);
 	return(1);
 }
 
@@ -795,7 +826,7 @@ argv_single(struct mdoc *mdoc, int line, 
 
 	v->sz = 1;
 	v->value = xcalloc(1, sizeof(char *));
-	v->value[0] = p;
+	v->value[0] = xstrdup(p);
 	return(1);
 }