X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_utils_expand_path.c;h=d7e7f2b054fb067570ca77543b94ed1405194b11;hp=44173f6f023e2c18ae8eb848ef15965c0978ca7c;hb=refs%2Fheads%2Fsow-2019-0002-rev1;hpb=890d8fe47755c3bad936389cf48ffa141cff41c9 diff --git a/tests/unit/test_utils_expand_path.c b/tests/unit/test_utils_expand_path.c index 44173f6f0..d7e7f2b05 100644 --- a/tests/unit/test_utils_expand_path.c +++ b/tests/unit/test_utils_expand_path.c @@ -1,18 +1,8 @@ /* - * Copyright (C) - 2013 Raphaël Beamonte + * Copyright (C) 2013 Raphaël Beamonte * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by as - * published by the Free Software Foundation; only version 2 of the License. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include @@ -26,8 +16,7 @@ #include -#include - +#include #include /* For error.h */ @@ -36,24 +25,25 @@ int lttng_opt_verbose = 3; int lttng_opt_mi; struct valid_test_input { - char *input; - char *relative_part; - char *absolute_part; + const char *input; + const char *relative_part; + const char *absolute_part; }; struct tree_symlink { - char *orig; - char *dest; + const char *orig; + const char *dest; }; struct symlink_test_input { - char *input; - char *expected_result; + const char *input; + const char *expected_result; }; /* Valid test cases */ static struct valid_test_input valid_tests_inputs[] = { { "/a/b/c/d/e", "", "/a/b/c/d/e" }, + { "/a//b//c/d/e", "", "/a/b/c/d/e" }, { "./a/b/c/d/e", ".", "/a/b/c/d/e" }, { "../a/b/c/d/../e", "..", "/a/b/c/e" }, { ".././a/b/c/d/./e", "..", "/a/b/c/d/e" }, @@ -120,14 +110,10 @@ static char *invalid_tests_inputs[] = { static const int num_invalid_tests = sizeof(invalid_tests_inputs) / sizeof(invalid_tests_inputs[0]); -#define ERRSIZE 100 -char errmsg[ERRSIZE]; -static void printerr(char *msg) -{ - fprintf(stderr, "test_utils_expand_path: error: %s\n", msg); -} +#define PRINT_ERR(fmt, args...) \ + fprintf(stderr, "test_utils_expand_path: error: " fmt "\n", ## args) -int prepare_valid_results(void) +static int prepare_valid_results(void) { int i; char *relative, *cur_path = NULL, *prev_path = NULL, @@ -140,7 +126,7 @@ int prepare_valid_results(void) pprev_path = realpath("../..", NULL); empty = strdup(""); if (!cur_path || !prev_path || !pprev_path || !empty) { - printerr("strdup out of memory"); + PRINT_ERR("strdup out of memory"); ret = -1; goto end; } @@ -148,14 +134,14 @@ int prepare_valid_results(void) /* allocate memory for the expected results */ valid_tests_expected_results = zmalloc(sizeof(char *) * num_valid_tests); if (!valid_tests_expected_results) { - printerr("out of memory"); + PRINT_ERR("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"); + PRINT_ERR("malloc expected results"); ret = -1; goto end; } @@ -183,7 +169,7 @@ end: return ret; } -int free_valid_results(void) +static int free_valid_results(void) { int i; @@ -196,37 +182,36 @@ int free_valid_results(void) return 0; } -int prepare_symlink_tree(void) +static int prepare_symlink_tree(void) { int i; - char tmppath[PATH_MAX]; + char tmppath[PATH_MAX] = {}; /* Create the temporary directory */ if (mkdtemp(tree_origin) == NULL) { - printerr("mkdtemp"); + PRINT_ERR("failed to mkdtemp"); goto error; } /* Create the directories of the test tree */ for (i = 0; i < num_tree_dirs; i++) { - snprintf(tmppath, PATH_MAX, "%s/%s", tree_origin, tree_dirs[i]); + snprintf(tmppath, sizeof(tmppath), "%s/%s", tree_origin, + tree_dirs[i]); if (mkdir(tmppath, 0755) != 0) { - snprintf(errmsg, ERRSIZE, "mkdir %s", tmppath); - printerr(errmsg); + PRINT_ERR("mkdir failed with path \"%s\"", tmppath); goto error; } } /* Create the symlinks of the test tree */ for (i = 0; i < num_tree_symlinks; i++) { - snprintf(tmppath, PATH_MAX, "%s/%s", + snprintf(tmppath, sizeof(tmppath), "%s/%s", tree_origin, tree_symlinks[i].orig); if (symlink(tree_symlinks[i].dest, tmppath) != 0) { - snprintf(errmsg, ERRSIZE, "symlink %s to %s", - tmppath, tree_symlinks[i].dest); - printerr(errmsg); + PRINT_ERR("failed to symlink \"%s\" to \"%s\"", tmppath, + tree_symlinks[i].dest); goto error; } } @@ -237,7 +222,7 @@ error: return 1; } -int free_symlink_tree(void) +static int free_symlink_tree(void) { int i; char tmppath[PATH_MAX]; @@ -248,8 +233,7 @@ int free_symlink_tree(void) tree_origin, tree_symlinks[i].orig); if (unlink(tmppath) != 0) { - snprintf(errmsg, ERRSIZE, "unlink %s", tmppath); - printerr(errmsg); + PRINT_ERR("failed to unlink \"%s\"", tmppath); goto error; } } @@ -259,16 +243,14 @@ int free_symlink_tree(void) snprintf(tmppath, PATH_MAX, "%s/%s", tree_origin, tree_dirs[i]); if (rmdir(tmppath) != 0) { - snprintf(errmsg, ERRSIZE, "rmdir %s", tmppath); - printerr(errmsg); + PRINT_ERR("failed to rmdir \"%s\"", tmppath); goto error; } } /* Remove the temporary directory */ if (rmdir(tree_origin) != 0) { - snprintf(errmsg, ERRSIZE, "rmdir %s", tree_origin); - printerr(errmsg); + PRINT_ERR("failed to rmdir \"%s\"", tree_origin); goto error; } @@ -281,8 +263,8 @@ error: static void test_utils_expand_path(void) { char *result; - char name[100], tmppath[PATH_MAX]; - int i; + char name[100], tmppath[PATH_MAX], real_tree_origin[PATH_MAX]; + int i, treelen; /* Test valid cases */ for (i = 0; i < num_valid_tests; i++) { @@ -295,14 +277,34 @@ static void test_utils_expand_path(void) free(result); } + /* + * Get the realpath for the tree_origin since it can itself be a + * symlink. + */ + result = realpath(tree_origin, real_tree_origin); + if (!result) { + fail("realpath failed."); + return; + } + /* Test symlink tree cases */ - int treelen = strlen(tree_origin) + 1; + treelen = strlen(real_tree_origin) + 1; for (i = 0; i < num_symlink_tests; i++) { + int ret; + sprintf(name, "symlink tree test case: [tmppath/]%s", symlink_tests_inputs[i].input); - snprintf(tmppath, PATH_MAX, "%s/%s", - tree_origin, symlink_tests_inputs[i].input); + ret = snprintf(tmppath, PATH_MAX, "%s/%s", + real_tree_origin, + symlink_tests_inputs[i].input); + if (ret == -1 || ret >= PATH_MAX) { + PRINT_ERR("truncation occurred while concatenating paths \"%s\" and \"%s\"", + real_tree_origin, + symlink_tests_inputs[i].input); + fail(name); + continue; + } result = utils_expand_path(tmppath); ok(result != NULL && strcmp(result + treelen, symlink_tests_inputs[i].expected_result) == 0, name); @@ -312,9 +314,12 @@ static void test_utils_expand_path(void) /* 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); }