Merge branch 'ab/sun-studio-portability'

diff --git a/test-parse-options.c b/test-parse-options.c
index 4e3710b9a8fc868642e1e0e8f4af37eeb1ce0ce4..36487c402b264433a3bfda7f84ef9c9a8df8cbb7 100644 (file)
--- a/test-parse-options.c
+++ b/test-parse-options.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "parse-options.h"
+#include "string-list.h"
 
 static int boolean = 0;
 static int integer = 0;
@@ -9,6 +10,7 @@ static int verbose = 0, dry_run = 0, quiet = 0;
 static char *string = NULL;
 static char *file = NULL;
 static int ambiguous;
+static struct string_list list;
 
 static int length_callback(const struct option *opt, const char *arg, int unset)
 {
@@ -52,8 +54,10 @@ int main(int argc, const char **argv)
                OPT_STRING(0, "string2", &string, "str", "get another string"),
                OPT_STRING(0, "st", &string, "st", "get another string (pervert ordering)"),
                OPT_STRING('o', NULL, &string, "str", "get another string"),
+               OPT_NOOP_NOARG(0, "obsolete"),
                OPT_SET_PTR(0, "default-string", &string,
                        "set string to default", (unsigned long)"default"),
+               OPT_STRING_LIST(0, "list", &list, "str", "add str to list"),
                OPT_GROUP("Magic arguments"),
                OPT_ARGUMENT("quux", "means --quux"),
                OPT_NUMBER_CALLBACK(&integer, "set integer to NUM",
@@ -85,6 +89,9 @@ int main(int argc, const char **argv)
        printf("dry run: %s\n", dry_run ? "yes" : "no");
        printf("file: %s\n", file ? file : "(not set)");
 
+       for (i = 0; i < list.nr; i++)
+               printf("list: %s\n", list.items[i].string);
+
        for (i = 0; i < argc; i++)
                printf("arg %02d: %s\n", i, argv[i]);