source@mandoc.bsd.lv
 help / color / mirror / Atom feed
* mdocml: Add back in a check that the leading `-' exists for arguments.
@ 2011-06-18 16:53 kristaps
  0 siblings, 0 replies; only message in thread
From: kristaps @ 2011-06-18 16:53 UTC (permalink / raw)
  To: source

Log Message:
-----------
Add back in a check that the leading `-' exists for arguments.  This 
mysteriously disappeared in 1.14.  No idea why.  While here, remove an
unnecessary header and order the function prototypes.

Modified Files:
--------------
    mdocml:
        mdoc_argv.c

Revision Data
-------------
Index: mdoc_argv.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_argv.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -Lmdoc_argv.c -Lmdoc_argv.c -u -p -r1.79 -r1.80
--- mdoc_argv.c
+++ mdoc_argv.c
@@ -21,7 +21,6 @@
 #include <sys/types.h>
 
 #include <assert.h>
-#include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -52,16 +51,16 @@ struct	mdocarg {
 	const enum mdocargt *argvs;
 };
 
+static	void		 argn_free(struct mdoc_arg *, int);
 static	enum margserr	 args(struct mdoc *, int, int *, 
 				char *, enum argsflag, char **);
 static	int		 args_checkpunct(const char *, int);
-static	int		 argv_single(struct mdoc *, int, 
+static	int		 argv_multi(struct mdoc *, int, 
 				struct mdoc_argv *, int *, char *);
 static	int		 argv_opt_single(struct mdoc *, int, 
 				struct mdoc_argv *, int *, char *);
-static	int		 argv_multi(struct mdoc *, int, 
+static	int		 argv_single(struct mdoc *, int, 
 				struct mdoc_argv *, int *, char *);
-static	void		 argn_free(struct mdoc_arg *, int);
 
 static	const enum argvflag argvflags[MDOC_ARG_MAX] = {
 	ARGV_NONE,	/* MDOC_Split */
@@ -290,8 +289,8 @@ mdoc_argv(struct mdoc *m, int line, enum
 		return(ARGV_EOLN);
 	else if (NULL == (ap = mdocargs[tok].argvs))
 		return(ARGV_WORD);
-
-	assert(' ' != buf[*pos]);
+	else if ('-' != buf[*pos])
+		return(ARGV_WORD);
 
 	/* Seek to the first unescaped space. */
 
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2011-06-18 16:53 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-18 16:53 mdocml: Add back in a check that the leading `-' exists for arguments kristaps

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).