Idea-Studios/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-06-22 06:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

repo: simplify safe.directory checks

Browse Source 
Use some standard libgit2 utility functions.
This commit is contained in:
Edward Thomson
2026-06-01 23:39:07 +01:00
parent 2eed889d8a
commit 72d4157dff
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libgit2/repository.c
View File

@@ -582,7 +582,7 @@ static int validate_ownership_cb(const git_config_entry *entry, void *payload)
} else if (strcmp(entry->value, "*") == 0) { } else if (strcmp(entry->value, "*") == 0) {
*data->is_safe = true; *data->is_safe = true;
} else { } else {
bool is_prefix = false; bool is_prefix = false, match;
if (git_str_sets(&data->tmp, entry->value) < 0) if (git_str_sets(&data->tmp, entry->value) < 0)
return -1; return -1;
@@ -591,11 +591,9 @@ static int validate_ownership_cb(const git_config_entry *entry, void *payload)
* A value ending with slash* is treated as a prefix match. * A value ending with slash* is treated as a prefix match.
* Strip only the '*', leaving the trailing slash in place. * Strip only the '*', leaving the trailing slash in place.
*/ */
if (data->tmp.size >= 2 && if (git__suffixcmp(data->tmp.ptr, "/*") == 0) {
data->tmp.ptr[data->tmp.size - 2] == '/' &&
data->tmp.ptr[data->tmp.size - 1] == '*') {
is_prefix = true; is_prefix = true;
git_str_truncate(&data->tmp, data->tmp.size - 1); git_str_shorten(&data->tmp, 1);
} }
if (!git_fs_path_is_root(data->tmp.ptr)) { if (!git_fs_path_is_root(data->tmp.ptr)) {
@@ -636,12 +634,11 @@ static int validate_ownership_cb(const git_config_entry *entry, void *payload)
if (strncmp(test_path, "%(prefix)//", strlen("%(prefix)//")) == 0) if (strncmp(test_path, "%(prefix)//", strlen("%(prefix)//")) == 0)
test_path += strlen("%(prefix)/"); test_path += strlen("%(prefix)/");
if (is_prefix) { match = is_prefix ?
size_t len = strlen(test_path); (git__prefixcmp(data->repo_path, test_path) == 0) :
(strcmp(test_path, data->repo_path) == 0);
if (strncmp(test_path, data->repo_path, len) == 0) if (match)
*data->is_safe = true;
} else if (strcmp(test_path, data->repo_path) == 0)
*data->is_safe = true; *data->is_safe = true;
} }