Fixed a multiple identical option bug uncovered by Chris Lamb

sourcetar

@@ -1,7 +1,7 @@
 #!/bin/bash
 PROJECT=yodl
 
-(cd yodl; ./build clean)
+cd ~/git/yodl/src
 
 if [ -e /usr/share/common-licenses/GPL ] ; then
     cp /usr/share/common-licenses/GPL ${PROJECT}/LICENSE

yodl/VERSION

@@ -1,2 +1,2 @@
-#define VERSION "3.07.01"
+#define VERSION "3.08.00"
 #define YEARS   "1996-2016"

yodl/changelog

@@ -1,3 +1,18 @@
+yodl (3.08.00)
+
+  * Fixed a bug in handling multiply options of identical types (e.g., -D,
+    -D). The bug was hidden in args/argsmultiargs.c but sheer accidentally has
+    never shown itself. Now fixed.
+
+  * The usage info now also shows the std. copyright notice, writes its
+    information to the std. output stream, and returns 0 to the operating
+    system. 
+
+  * Fixed an XXfigurecounter increment occurring too early in the figure.raw
+    macro. 
+
+ -- Frank B. Brokken <f.b.brokken@rug.nl>  Sat, 30 Apr 2016 18:22:23 +0530
+
 yodl (3.07.01)
 
   * Hanno B\"ock reported an invalid memory read found by the address sanitizer

yodl/man/yodlconverters.in

@@ -71,7 +71,7 @@ manpagefiles()
 
     Each bf(yodl2)em(format) converter requires a file em(format.yo) in Yodl's
     include path (e.g., tt(@STD_INCLUDE@)). This file is auto-loaded before
-    tt(FILE) (see the synopsys) is loaded, to make the conversion to
+    tt(FILE) (see the synopsis) is loaded, to make the conversion to
     em(format) possible.
 
     The output is written to one or more files having the extension

yodl/src/args/argsmultiarg.c

@@ -1,24 +1,34 @@
 #include "args.ih"
 
 static char const *str;
+static char const *searchStr;
 static int option;
 
+// The full string is a string containing all the single-letter options that
+// were specified. E.g., DDvD if -D -D -v -D was specified. When called with a
+// non-0 argument str and searchStr are (re)initialized to the beginning of
+// the string. Then, and at each subsequent call using a zero-arg the saved
+// opchar is searched from where searchStr points. Following this search
+// searchStr is incremented, unless it points to the option string's 0-byte
+// The location of the optchar in str is then used as index in the array of
+// args.d_optarg, returning the associated value.
+
 char const *args_multiarg(int optchar)
 {
-    register char const *pos;
-
     if (optchar)                                    /* new option:          */
     {
         str = string_str(&args.d_option);           /* use full string      */
+        searchStr = str;
         option = optchar;                           /* save the option char */
     }
 
-    pos = strchr(str, option);
+    register char const *pos = strchr(searchStr, option);
+    if (*searchStr != 0)                            // shift to the next ch.*/
+        ++searchStr;
 
     if (pos)
     {
         size_t idx = pos - str;
-        str = pos + 1;
         return args.d_optarg[idx];                  /* return optionstr.    */
     }
 

yodl/src/yodl/usage.c

@@ -11,10 +11,11 @@
 
 void usage()
 {
-    fprintf (stderr, "%s%s%s%s%d%s%d%s",
+    printf("%s%s%s%s%d%s%d%s",
     message_version(),
 "\n"
 "Your Own Document Language\n"
+"Copyright (c) GPL " YEARS ". NO WARRANTY.\n"
 "\n"
 "Usage: yodl [OPTION]... [FILE]...\n"
 "Convert to various documentation formats from FILE or <stdin>.\n"
@@ -62,8 +63,7 @@ void usage()
 "  -w, --warn           warn about no-macro calls\n"
 "\n");
 
-
-    exit (1);
+    exit(0);
 }