proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-11 10:25:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a small issue in git__join_path(). Added tests to exercise git__join_path().

Browse Source
This commit is contained in:
nulltoken 2011-02-05 19:22:44 +01:00
parent ca0fb40a6f
commit a79e8e632a
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/util.c
View File

@ -207,6 +207,8 @@ char *git__joinpath(const char *path_a, const char *path_b)
int len_a, len_b; int len_a, len_b;
char *path_new; char *path_new;
assert(path_a && path_b);
len_a = strlen(path_a); len_a = strlen(path_a);
len_b = strlen(path_b); len_b = strlen(path_b);
@ -216,7 +218,7 @@ char *git__joinpath(const char *path_a, const char *path_b)
strcpy(path_new, path_a); strcpy(path_new, path_a);
if (path_new[len_a - 1] != '/') if (len_a > 0 && len_b > 0 && path_new[len_a - 1] != '/')
path_new[len_a++] = '/'; path_new[len_a++] = '/';
if (path_b[0] == '/') if (path_b[0] == '/')

29
tests/t00-core.c
View File

@ -342,6 +342,34 @@ BEGIN_TEST("path", dir_path_prettifying)
must_fail(ensure_dir_path_normalized("/d1/.../d2", NULL)); must_fail(ensure_dir_path_normalized("/d1/.../d2", NULL));
END_TEST END_TEST
static int ensure_joinpath(const char *path_a, const char *path_b, const char *expected_path)
{
int error = GIT_SUCCESS;
char* joined_path;
joined_path = git__joinpath(path_a, path_b);
if (joined_path == NULL)
return GIT_ERROR;
if (strcmp(joined_path, expected_path))
error = GIT_ERROR;
return error;
}
BEGIN_TEST("path", joinpath)
must_pass(ensure_joinpath("", "", ""));
must_pass(ensure_joinpath("", "a", "a"));
must_pass(ensure_joinpath("a", "", "a"));
must_pass(ensure_joinpath("a", "b", "a/b"));
must_pass(ensure_joinpath("/", "a", "/a"));
must_pass(ensure_joinpath("/", "", "/"));
must_pass(ensure_joinpath("/a", "/b", "/a/b"));
must_pass(ensure_joinpath("/a", "/b/", "/a/b/"));
must_pass(ensure_joinpath("/a/", "b/", "/a/b/"));
must_pass(ensure_joinpath("/a/", "/b/", "/a/b/"));
END_TEST
typedef struct name_data { typedef struct name_data {
int count; /* return count */ int count; /* return count */
char *name; /* filename */ char *name; /* filename */
@ -601,6 +629,7 @@ git_testsuite *libgit2_suite_core(void)
ADD_TEST(suite, "path", file_path_prettifying); ADD_TEST(suite, "path", file_path_prettifying);
ADD_TEST(suite, "path", dir_path_prettifying); ADD_TEST(suite, "path", dir_path_prettifying);
ADD_TEST(suite, "path", joinpath);
ADD_TEST(suite, "dirent", dot); ADD_TEST(suite, "dirent", dot);
ADD_TEST(suite, "dirent", sub); ADD_TEST(suite, "dirent", sub);