From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1]) by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id p5IGrRNf004052 for ; Sat, 18 Jun 2011 12:53:28 -0400 (EDT) Received: (from kristaps@localhost) by krisdoz.my.domain (8.14.3/8.14.3/Submit) id p5IGrR9x029740; Sat, 18 Jun 2011 12:53:27 -0400 (EDT) Date: Sat, 18 Jun 2011 12:53:27 -0400 (EDT) Message-Id: <201106181653.p5IGrR9x029740@krisdoz.my.domain> X-Mailinglist: mdocml-source Reply-To: source@mdocml.bsd.lv MIME-Version: 1.0 From: kristaps@mdocml.bsd.lv To: source@mdocml.bsd.lv Subject: mdocml: Add back in a check that the leading `-' exists for arguments. X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 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 #include -#include #include #include #include @@ -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