return NULL;
}
-char *test_arg(const char *optarg, void *arg)
+char *test_arg(const char *optarg, const char *arg)
{
test_cb_called++;
ok1(strcmp(optarg, arg) == 0);
return NULL;
}
+void show_arg(char buf[OPT_SHOW_LEN], const char *arg)
+{
+ strncpy(buf, arg, OPT_SHOW_LEN);
+}
+
char *err_output = NULL;
static void save_err_output(const char *fmt, ...)
char *p;
va_start(ap, fmt);
- vasprintf(&p, fmt, ap);
+ /* Check return, for fascist gcc */
+ if (vasprintf(&p, fmt, ap) == -1)
+ p = NULL;
va_end(ap);
if (err_output) {
struct opt_table short_table[] = {
/* Short opts, different args. */
- { OPT_WITHOUT_ARG(NULL, 'a', test_noarg, "a"), "Description of a" },
- { OPT_WITH_ARG(NULL, 'b', test_arg, "b"), "Description of b" },
+ OPT_WITHOUT_ARG("-a", test_noarg, "a", "Description of a"),
+ OPT_WITH_ARG("-b", test_arg, show_arg, "b", "Description of b"),
OPT_ENDTABLE
};
struct opt_table long_table[] = {
/* Long opts, different args. */
- { OPT_WITHOUT_ARG("ddd", 0, test_noarg, "ddd"), "Description of ddd" },
- { OPT_WITH_ARG("eee", 0, test_arg, "eee"), "Description of eee" },
+ OPT_WITHOUT_ARG("--ddd", test_noarg, "ddd", "Description of ddd"),
+ OPT_WITH_ARG("--eee <filename>", test_arg, show_arg, "eee", ""),
OPT_ENDTABLE
};
struct opt_table long_and_short_table[] = {
/* Short and long, different args. */
- { OPT_WITHOUT_ARG("ggg", 'g', test_noarg, "ggg"),
- "Description of ggg" },
- { OPT_WITH_ARG("hhh", 'h', test_arg, "hhh"), "Description of hhh"},
+ OPT_WITHOUT_ARG("--ggg|-g", test_noarg, "ggg", "Description of ggg"),
+ OPT_WITH_ARG("-h|--hhh", test_arg, NULL, "hhh", "Description of hhh"),
OPT_ENDTABLE
};
/* Sub-table test. */
struct opt_table subtables[] = {
- /* Short and long, no description */
- { OPT_WITH_ARG("jjj", 'j', test_arg, "jjj") },
+ /* Two short, and two long long, no description */
+ OPT_WITH_ARG("--jjj|-j|--lll|-l", test_arg, show_arg, "jjj", ""),
+ /* Hidden option */
+ OPT_WITH_ARG("--mmm|-m", test_arg, show_arg, "mmm", opt_hidden),
OPT_SUBTABLE(short_table, NULL),
OPT_SUBTABLE(long_table, "long table options"),
- OPT_SUBTABLE(long_and_short_table, opt_table_hidden),
+ OPT_SUBTABLE(long_and_short_table, NULL),
OPT_ENDTABLE
};