proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-07-09 19:21:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move the path comparison method to fileops.c

Browse Source 
Signed-off-by: Vicent Marti <tanoku@gmail.com>
This commit is contained in:
Vicent Marti 2011-02-27 22:09:36 +02:00
parent da7c3c71c0
commit ccef1c9dc2
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/fileops.c
View File

@ -493,3 +493,22 @@ int gitfo_prettify_file_path(char *buffer_out, const char *path)
return GIT_SUCCESS; return GIT_SUCCESS;
} }
int gitfo_cmp_path(const char *name1, int len1, int isdir1,
const char *name2, int len2, int isdir2)
{
int len = len1 < len2 ? len1 : len2;
int cmp;
cmp = memcmp(name1, name2, len);
if (cmp)
return cmp;
if (len1 < len2)
return ((!isdir1 && !isdir2) ? -1 :
(isdir1 ? '/' - name2[len1] : name2[len1] - '/'));
if (len1 > len2)
return ((!isdir1 && !isdir2) ? 1 :
(isdir2 ? name1[len2] - '/' : '/' - name1[len2]));
return 0;
}

4
src/fileops.h
View File

@ -131,6 +131,10 @@ extern int gitfo_write_cached(gitfo_cache *ioc, void *buf, size_t len);
extern int gitfo_flush_cached(gitfo_cache *ioc); extern int gitfo_flush_cached(gitfo_cache *ioc);
extern int gitfo_close_cached(gitfo_cache *ioc); extern int gitfo_close_cached(gitfo_cache *ioc);
extern int gitfo_cmp_path(const char *name1, int len1, int isdir1,
const char *name2, int len2, int isdir2);
/** /**
* Clean up a provided absolute or relative directory path. * Clean up a provided absolute or relative directory path.
* *

20
src/tree.c
View File

@ -40,30 +40,12 @@ int entry_search_cmp(const void *key, const void *array_member)
return strcmp(filename, entry->filename); return strcmp(filename, entry->filename);
} }
static int cache_name_compare(const char *name1, int len1, int isdir1,
const char *name2, int len2, int isdir2)
{
int len = len1 < len2 ? len1 : len2;
int cmp;
cmp = memcmp(name1, name2, len);
if (cmp)
return cmp;
if (len1 < len2)
return ((!isdir1 && !isdir2) ? -1 :
(isdir1 ? '/' - name2[len1] : name2[len1] - '/'));
if (len1 > len2)
return ((!isdir1 && !isdir2) ? 1 :
(isdir2 ? name1[len2] - '/' : '/' - name1[len2]));
return 0;
}
int entry_sort_cmp(const void *a, const void *b) int entry_sort_cmp(const void *a, const void *b)
{ {
const git_tree_entry *entry_a = *(const git_tree_entry **)(a); const git_tree_entry *entry_a = *(const git_tree_entry **)(a);
const git_tree_entry *entry_b = *(const git_tree_entry **)(b); const git_tree_entry *entry_b = *(const git_tree_entry **)(b);
return cache_name_compare(entry_a->filename, strlen(entry_a->filename), return gitfo_cmp_path(entry_a->filename, strlen(entry_a->filename),
entry_a->attr & 040000, entry_a->attr & 040000,
entry_b->filename, strlen(entry_b->filename), entry_b->filename, strlen(entry_b->filename),
entry_b->attr & 040000); entry_b->attr & 040000);