From 4d0e00fc396f69ea4575cca04855817cbf289670 Mon Sep 17 00:00:00 2001
From: Kristaps Dzonsons <kristaps@bsd.lv>
Date: Mon, 19 Jan 2009 17:02:58 +0000
Subject: Removed unnecessary test cases (most were for visual). Finally fixed
 scope-rewinding (MDOC_VALID).

---
 argv.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'argv.c')

diff --git a/argv.c b/argv.c
index fd32241d..a2d62608 100644
--- a/argv.c
+++ b/argv.c
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.16 2009/01/17 20:10:36 kristaps Exp $ */
+/* $Id: argv.c,v 1.17 2009/01/19 17:02:58 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -78,7 +78,8 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
 
 	/* Parse routine for non-quoted string. */
 
-	if ('\"' != buf[*pos]) {
+	assert(*pos > 0);
+	if ('\"' != buf[*pos] || ! (ARGS_QUOTED & fl)) {
 		*v = &buf[*pos];
 
 		/* FIXME: UGLY tab-sep processing. */
@@ -98,9 +99,14 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
 				}
 				(*pos)++;
 			}
-		else
-			while (buf[*pos] && ! isspace(buf[*pos]))
+		else {
+			while (buf[*pos]) {
+				if (isspace(buf[*pos]))
+					if ('\\' != buf[*pos - 1])
+						break;
 				(*pos)++;
+			}
+		}
 
 		if (0 == buf[*pos])
 			return(ARGS_WORD);
@@ -451,8 +457,13 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
 	v->line = line;
 	v->pos = *pos;
 
-	while (buf[*pos] && ! isspace(buf[*pos]))
+	assert(*pos > 0);
+	while (buf[*pos]) {
+		if (isspace(buf[*pos])) 
+			if ('\\' != buf[*pos - 1])
+				break;
 		(*pos)++;
+	}
 
 	if (buf[*pos])
 		buf[(*pos)++] = 0;
-- 
cgit v1.2.3