#include <tap/tap.h>
-#include <src/common/utils.h>
+#include <common/utils.h>
+#include <common/common.h>
-/* For lttngerr.h */
+/* For error.h */
int lttng_opt_quiet = 1;
int lttng_opt_verbose = 3;
+int lttng_opt_mi;
struct valid_test_input {
char *input;
{ ".", ".", "" },
{ "/../a/b/c/d/e", "", "/a/b/c/d/e" },
{ "/a/b/c/d/../../../../../e", "", "/e" },
+ { "/..", "", "/" },
+ { "/a/..", "", "/" },
};
char **valid_tests_expected_results;
static const int num_valid_tests =
fprintf(stderr, "test_utils_expand_path: error: %s\n", msg);
}
-int prepare_valid_results()
+int prepare_valid_results(void)
{
int i;
- char *relative, *cur_path, *prev_path, *pprev_path, *empty;
+ char *relative, *cur_path = NULL, *prev_path = NULL,
+ *pprev_path = NULL, *empty = NULL;
+ int ret = 0;
/* Prepare the relative paths */
cur_path = realpath(".", NULL);
prev_path = realpath("..", NULL);
pprev_path = realpath("../..", NULL);
empty = strdup("");
+ if (!cur_path || !prev_path || !pprev_path || !empty) {
+ printerr("strdup out of memory");
+ ret = -1;
+ goto end;
+ }
/* allocate memory for the expected results */
- valid_tests_expected_results = malloc(sizeof(char *) * num_valid_tests);
+ valid_tests_expected_results = zmalloc(sizeof(char *) * num_valid_tests);
+ if (!valid_tests_expected_results) {
+ printerr("out of memory");
+ ret = -1;
+ goto end;
+ }
for (i = 0; i < num_valid_tests; i++) {
valid_tests_expected_results[i] = malloc(PATH_MAX);
if (valid_tests_expected_results[i] == NULL) {
printerr("malloc expected results");
- return 1;
+ ret = -1;
+ goto end;
}
if (strcmp(valid_tests_inputs[i].relative_part, ".") == 0) {
"%s%s", relative, valid_tests_inputs[i].absolute_part);
}
+end:
free(cur_path);
free(prev_path);
free(pprev_path);
free(empty);
- return 0;
+ return ret;
}
-int free_valid_results()
+int free_valid_results(void)
{
int i;
return 0;
}
-int prepare_symlink_tree()
+int prepare_symlink_tree(void)
{
int i;
char tmppath[PATH_MAX];
return 1;
}
-int free_symlink_tree()
+int free_symlink_tree(void)
{
int i;
char tmppath[PATH_MAX];
/* Test invalid cases */
for (i = 0; i < num_invalid_tests; i++) {
- sprintf(name, "invalid test case: %s", invalid_tests_inputs[i]);
+ const char *test_input = invalid_tests_inputs[i];
+
+ sprintf(name, "invalid test case: %s", test_input ?
+ test_input : "NULL");
- result = utils_expand_path(invalid_tests_inputs[i]);
+ result = utils_expand_path(test_input);
if (result != NULL) {
free(result);
}