#define vfprintf(f, fmt, ap) saved_vprintf(fmt, ap)
static int saved_vprintf(const char *fmt, va_list ap);
-#define malloc(size) saved_malloc(size)
-static void *saved_malloc(size_t size);
-
#include <ccan/opt/helpers.c>
#include <ccan/opt/opt.c>
#include <ccan/opt/usage.c>
#include <ccan/opt/parse.c>
-static void reset_options(void)
-{
- free(opt_table);
- opt_table = NULL;
- opt_count = opt_num_short = opt_num_short_arg = opt_num_long = 0;
-}
-
static char *output = NULL;
static int saved_vprintf(const char *fmt, va_list ap)
return ret;
}
-#undef malloc
-static void *last_allocation;
-static void *saved_malloc(size_t size)
+static void set_args(int *argc, char ***argv, ...)
{
- return last_allocation = malloc(size);
+ va_list ap;
+ *argv = malloc(sizeof(**argv) * 20);
+
+ va_start(ap, argv);
+ for (*argc = 0;
+ ((*argv)[*argc] = va_arg(ap, char*)) != NULL;
+ (*argc)++);
+ va_end(ap);
}
/* Test helpers. */
int main(int argc, char *argv[])
{
- plan_tests(452);
+ plan_tests(454);
/* opt_set_bool */
{
}
/* opt_set_charp */
{
- char *arg = (char *)"wrong";
+ char *arg = cast_const(char *, "wrong");
reset_options();
opt_register_arg("-a", opt_set_charp, NULL, &arg, "All");
ok1(parse_args(&argc, &argv, "-a", "string", NULL));
/* parse_args allocates argv */
free(argv);
- argc = 2;
- argv = malloc(sizeof(argv[0]) * 3);
- argv[0] = (char *)"thisprog";
- argv[1] = (char *)"-a";
- argv[2] = NULL;
+ set_args(&argc, &argv, "thisprog", "-a", NULL);
exitval = setjmp(exited);
if (exitval == 0) {
fail("opt_show_version_and_exit returned?");
} else {
ok1(exitval - 1 == 0);
+ /* We should have freed table!. */
+ ok1(opt_table == NULL);
}
ok1(strcmp(output, "1.2.3\n") == 0);
free(output);
opt_register_noarg("-a",
opt_usage_and_exit, "[args]", "");
- argc = 2;
- argv = malloc(sizeof(argv[0]) * 3);
- argv[0] = (char *)"thisprog";
- argv[1] = (char *)"-a";
- argv[2] = NULL;
+ set_args(&argc, &argv, "thisprog", "-a", NULL);
exitval = setjmp(exited);
if (exitval == 0) {
fail("opt_usage_and_exit returned?");
} else {
ok1(exitval - 1 == 0);
+ /* We should have freed table!. */
+ ok1(opt_table == NULL);
}
ok1(strstr(output, "[args]"));
ok1(strstr(output, argv[0]));
- ok1(strstr(output, "[-a]"));
+ ok1(strstr(output, "\n-a"));
free(output);
free(argv);
- /* It exits without freeing usage string. */
- free(last_allocation);
output = NULL;
}
opt_register_noarg("-a",
opt_usage_and_exit, "[args]", "");
- argc = 2;
- argv = malloc(sizeof(argv[0]) * 3);
- argv[0] = (char *)"thisprog";
- argv[1] = (char *)"--garbage";
- argv[2] = NULL;
+ set_args(&argc, &argv, "thisprog", "--garbage", NULL);
ok1(!opt_parse(&argc, argv, opt_log_stderr));
ok1(!strcmp(output,
"thisprog: --garbage: unrecognized option\n"));
reset_options();
opt_register_noarg("-a",
opt_usage_and_exit, "[args]", "");
- argc = 2;
- argv = malloc(sizeof(argv[0]) * 3);
- argv[0] = (char *)"thisprog";
- argv[1] = (char *)"--garbage";
- argv[2] = NULL;
+ set_args(&argc, &argv, "thisprog", "--garbage", NULL);
exitval = setjmp(exited);
if (exitval == 0) {
opt_parse(&argc, argv, opt_log_stderr_exit);