kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Use is_absolute_path() in sha1_file.c. 

There are some places that test for an absolute path. Use the helper
function to ease porting.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Sixt 2007-11-13 21:05:00 +01:00 committed by Junio C Hamano
parent 25482a3c0c
commit 85dadc3894
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sha1_file.c
View File

@ -86,7 +86,7 @@ int safe_create_leading_directories(char *path)
char *pos = path; char *pos = path;
struct stat st; struct stat st;


if (*pos == '/') if (is_absolute_path(path))
pos++; pos++;


while (pos) { while (pos) {
@ -253,7 +253,7 @@ static int link_alt_odb_entry(const char * entry, int len, const char * relative
int entlen = pfxlen + 43; int entlen = pfxlen + 43;
int base_len = -1; int base_len = -1;


if (*entry != '/' && relative_base) { if (!is_absolute_path(entry) && relative_base) {
/* Relative alt-odb */ /* Relative alt-odb */
if (base_len < 0) if (base_len < 0)
base_len = strlen(relative_base) + 1; base_len = strlen(relative_base) + 1;
@ -262,7 +262,7 @@ static int link_alt_odb_entry(const char * entry, int len, const char * relative
} }
ent = xmalloc(sizeof(*ent) + entlen); ent = xmalloc(sizeof(*ent) + entlen);


if (*entry != '/' && relative_base) { if (!is_absolute_path(entry) && relative_base) {
memcpy(ent->base, relative_base, base_len - 1); memcpy(ent->base, relative_base, base_len - 1);
ent->base[base_len - 1] = '/'; ent->base[base_len - 1] = '/';
memcpy(ent->base + base_len, entry, len); memcpy(ent->base + base_len, entry, len);
@ -333,7 +333,7 @@ static void link_alt_odb_entries(const char *alt, const char *ep, int sep,
while (cp < ep && *cp != sep) while (cp < ep && *cp != sep)
cp++; cp++;
if (last != cp) { if (last != cp) {
if ((*last != '/') && depth) { if (!is_absolute_path(last) && depth) {
error("%s: ignoring relative alternate object store %s", error("%s: ignoring relative alternate object store %s",
relative_base, last); relative_base, last);
} else { } else {