#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 last_allocation = malloc(size);
}
+static void set_args(int *argc, char ***argv, ...)
+{
+ 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[])
{
}
else
fail("FIXME: Handle other long long int"
- " sizes (specifically %lu bytes)",
+ " sizes (specifically %zu bytes)",
sizeof(long long));
}
/* opt_set_ulonglongval_bi */
char buf[OPT_SHOW_LEN+2] = { 0 };
buf[OPT_SHOW_LEN] = '!';
i = 7777;
- opt_show_ulonglongval_bi(buf, &i);
+ opt_show_ulonglongval_bi(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "7777") == 0);
ok1(buf[OPT_SHOW_LEN] == '!');
i = 10240000 * k;
- opt_show_ulonglongval_bi(buf, &i);
+ opt_show_ulonglongval_bi(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "10000M") == 0);
ok1(buf[OPT_SHOW_LEN] == '!');
i = 5 * P;
- opt_show_ulonglongval_bi(buf, &i);
+ opt_show_ulonglongval_bi(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "5P") == 0);
ok1(buf[OPT_SHOW_LEN] == '!');
i = 1024 * P;
- opt_show_ulonglongval_bi(buf, &i);
+ opt_show_ulonglongval_bi(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "1E") == 0);
ok1(buf[OPT_SHOW_LEN] == '!');
}
/* opt_set_ulongval_si */
{
- unsigned long long int arg = 1000;
+ unsigned long int arg = 1000;
reset_options();
opt_register_arg("-a", opt_set_ulongval_si, NULL,
ok1(arg == 1 * G);
ok1(!parse_args(&argc, &argv, "-a", "-1G", NULL));
ok1(parse_args(&argc, &argv, "-a", "4G", NULL));
- ok1(arg == 4000000000);
+ ok1(arg == 4000000000U);
if (sizeof(long) == 4){
ok1(!parse_args(&argc, &argv, "-a", "4294967296", NULL));
ok1(!parse_args(&argc, &argv, "-a", "4295M", NULL));
}
else
fail("FIXME: Handle other long long int"
- " sizes (specifically %lu bytes)",
+ " sizes (specifically %zu bytes)",
sizeof(long long));
}
char buf[OPT_SHOW_LEN+2] = { 0 };
buf[OPT_SHOW_LEN] = '!';
i = 7777;
- opt_show_ulonglongval_si(buf, &i);
+ opt_show_ulonglongval_si(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "7777") == 0);
ok1(buf[OPT_SHOW_LEN] == '!');
i = 10240000 * k;
- opt_show_ulonglongval_si(buf, &i);
+ opt_show_ulonglongval_si(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "10240M") == 0);
ok1(buf[OPT_SHOW_LEN] == '!');
i = 5 * P;
- opt_show_ulonglongval_si(buf, &i);
+ opt_show_ulonglongval_si(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "5P") == 0);
ok1(buf[OPT_SHOW_LEN] == '!');
i = 1000 * P;
- opt_show_ulonglongval_si(buf, &i);
+ opt_show_ulonglongval_si(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "1E") == 0);
ok1(buf[OPT_SHOW_LEN] == '!');
}
/* parse_args allocates argv */
free(argv);
- argc = 2;
- argv = malloc(sizeof(argv[0]) * 3);
- argv[0] = "thisprog";
- argv[1] = "-a";
- argv[2] = NULL;
+ set_args(&argc, &argv, "thisprog", "-a", NULL);
exitval = setjmp(exited);
if (exitval == 0) {
opt_register_noarg("-a",
opt_usage_and_exit, "[args]", "");
- argc = 2;
- argv = malloc(sizeof(argv[0]) * 3);
- argv[0] = "thisprog";
- argv[1] = "-a";
- argv[2] = NULL;
+ set_args(&argc, &argv, "thisprog", "-a", NULL);
exitval = setjmp(exited);
if (exitval == 0) {
opt_register_noarg("-a",
opt_usage_and_exit, "[args]", "");
- argc = 2;
- argv = malloc(sizeof(argv[0]) * 3);
- argv[0] = "thisprog";
- argv[1] = "--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] = "thisprog";
- argv[1] = "--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);