No only does this give us one more ccanlint point, it clears the way
to see if we introduce a *real* memory leak later.
free(err_output);
err_output = NULL;
free(err_output);
err_output = NULL;
+ /* parse_args allocates argv */
+ free(argv);
#define vfprintf(f, fmt, ap) saved_vprintf(fmt, ap)
static int saved_vprintf(const char *fmt, va_list ap);
#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/helpers.c>
#include <ccan/opt/opt.c>
#include <ccan/opt/usage.c>
+#undef malloc
+static void *last_allocation;
+static void *saved_malloc(size_t size)
+{
+ return last_allocation = malloc(size);
+}
+
/* Test helpers. */
int main(int argc, char *argv[])
{
/* Test helpers. */
int main(int argc, char *argv[])
{
reset_options();
opt_register_noarg("-a",
opt_version_and_exit, "1.2.3", "");
reset_options();
opt_register_noarg("-a",
opt_version_and_exit, "1.2.3", "");
+ /* parse_args allocates argv */
+ free(argv);
+
+ argc = 2;
+ argv = malloc(sizeof(argv[0]) * 3);
+ argv[0] = "thisprog";
+ argv[1] = "-a";
+ argv[2] = NULL;
+
exitval = setjmp(exited);
if (exitval == 0) {
exitval = setjmp(exited);
if (exitval == 0) {
- parse_args(&argc, &argv, "-a", NULL);
+ opt_parse(&argc, argv, save_err_output);
fail("opt_show_version_and_exit returned?");
} else {
ok1(exitval - 1 == 0);
}
ok1(strcmp(output, "1.2.3\n") == 0);
free(output);
fail("opt_show_version_and_exit returned?");
} else {
ok1(exitval - 1 == 0);
}
ok1(strcmp(output, "1.2.3\n") == 0);
free(output);
reset_options();
opt_register_noarg("-a",
opt_usage_and_exit, "[args]", "");
reset_options();
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;
+
exitval = setjmp(exited);
if (exitval == 0) {
exitval = setjmp(exited);
if (exitval == 0) {
- parse_args(&argc, &argv, "-a", NULL);
+ opt_parse(&argc, argv, save_err_output);
fail("opt_usage_and_exit returned?");
} else {
ok1(exitval - 1 == 0);
fail("opt_usage_and_exit returned?");
} else {
ok1(exitval - 1 == 0);
ok1(strstr(output, argv[0]));
ok1(strstr(output, "[-a]"));
free(output);
ok1(strstr(output, argv[0]));
ok1(strstr(output, "[-a]"));
free(output);
+ free(argv);
+ /* It exits without freeing usage string. */
+ free(last_allocation);
ok1(!strcmp(output,
"thisprog: --garbage: unrecognized option\n"));
free(output);
ok1(!strcmp(output,
"thisprog: --garbage: unrecognized option\n"));
free(output);
reset_options();
opt_register_noarg("-a",
opt_usage_and_exit, "[args]", "");
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;
exitval = setjmp(exited);
if (exitval == 0) {
exitval = setjmp(exited);
if (exitval == 0) {
- argc = 2;
- argv = malloc(sizeof(argv[0]) * 3);
- argv[0] = "thisprog";
- argv[1] = "--garbage";
- argv[2] = NULL;
opt_parse(&argc, argv, opt_log_stderr_exit);
fail("opt_log_stderr_exit returned?");
} else {
ok1(exitval - 1 == 1);
}
opt_parse(&argc, argv, opt_log_stderr_exit);
fail("opt_log_stderr_exit returned?");
} else {
ok1(exitval - 1 == 1);
}
ok1(!strcmp(output,
"thisprog: --garbage: unrecognized option\n"));
free(output);
ok1(!strcmp(output,
"thisprog: --garbage: unrecognized option\n"));
free(output);
ok1(strcmp(argv[1], "extra") == 0);
ok1(strcmp(argv[2], "args") == 0);
ok1(strcmp(argv[1], "extra") == 0);
ok1(strcmp(argv[2], "args") == 0);
+ /* parse_args allocates argv */
+ free(argv);
+
ok1(strstr(output, "AAAAll"));
free(output);
ok1(strstr(output, "AAAAll"));
free(output);
+ free(shortname);
+ free(longname);
ok1(strcmp(argv[4], "-a") == 0);
ok1(!argv[5]);
ok1(strcmp(argv[4], "-a") == 0);
ok1(!argv[5]);
+ /* parse_args allocates argv */
+ free(argv);
-static void save_err_output(const char *fmt, ...)
+void save_err_output(const char *fmt, ...)
-/* FIXME: This leaks, BTW. */
+static bool allocated = false;
+
bool parse_args(int *argc, char ***argv, ...)
{
char **a;
bool parse_args(int *argc, char ***argv, ...)
{
char **a;
(*argc)++;
a = realloc(a, sizeof(*a) * (*argc + 1));
}
(*argc)++;
a = realloc(a, sizeof(*a) * (*argc + 1));
}
+
+ if (allocated)
+ free(*argv);
+
/* Re-set before parsing. */
optind = 0;
/* Re-set before parsing. */
optind = 0;
bool parse_args(int *argc, char ***argv, ...);
extern char *err_output;
bool parse_args(int *argc, char ***argv, ...);
extern char *err_output;
+void save_err_output(const char *fmt, ...);
extern unsigned int test_cb_called;
char *test_noarg(void *arg);
extern unsigned int test_cb_called;
char *test_noarg(void *arg);