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

refs.c: make resolve_ref_unsafe set errno to something meaningful on error 

Making errno when returning from resolve_ref_unsafe() meaningful,
which should fix

 * a bug in lock_ref_sha1_basic, where it assumes EISDIR
   means it failed due to a directory being in the way

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Michael Haggerty <mhagger@alum.mit.edu>
maint
Ronnie Sahlberg 2014-06-20 07:42:54 -07:00 committed by Junio C Hamano
parent d3f6655505
commit 76d70dc0c6
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cache.h
View File

@ -979,7 +979,7 @@ extern int read_ref(const char *refname, unsigned char *sha1);
* NULL. If more than MAXDEPTH recursive symbolic lookups are needed, * NULL. If more than MAXDEPTH recursive symbolic lookups are needed,
* give up and return NULL. * give up and return NULL.
* *
* errno is sometimes set on errors, but not always. * errno is set to something meaningful on error.
*/ */
extern const char *resolve_ref_unsafe(const char *ref, unsigned char *sha1, int reading, int *flag); extern const char *resolve_ref_unsafe(const char *ref, unsigned char *sha1, int reading, int *flag);
extern char *resolve_refdup(const char *ref, unsigned char *sha1, int reading, int *flag); extern char *resolve_refdup(const char *ref, unsigned char *sha1, int reading, int *flag);

19
refs.c
View File

@ -1334,6 +1334,7 @@ static const char *handle_missing_loose_ref(const char *refname,
} }
} }


/* This function needs to return a meaningful errno on failure */
const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int reading, int *flag) const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int reading, int *flag)
{ {
int depth = MAXDEPTH; int depth = MAXDEPTH;
@ -1344,8 +1345,10 @@ const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int rea
if (flag) if (flag)
*flag = 0; *flag = 0;


if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
errno = EINVAL;
return NULL; return NULL;
}


for (;;) { for (;;) {
char path[PATH_MAX]; char path[PATH_MAX];
@ -1353,8 +1356,10 @@ const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int rea
char *buf; char *buf;
int fd; int fd;


if (--depth < 0) if (--depth < 0) {
errno = ELOOP;
return NULL; return NULL;
}


git_snpath(path, sizeof(path), "%s", refname); git_snpath(path, sizeof(path), "%s", refname);


@ -1416,9 +1421,13 @@ const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int rea
return NULL; return NULL;
} }
len = read_in_full(fd, buffer, sizeof(buffer)-1); len = read_in_full(fd, buffer, sizeof(buffer)-1);
close(fd); if (len < 0) {
if (len < 0) int save_errno = errno;
close(fd);
errno = save_errno;
return NULL; return NULL;
}
close(fd);
while (len && isspace(buffer[len-1])) while (len && isspace(buffer[len-1]))
len--; len--;
buffer[len] = '\0'; buffer[len] = '\0';
@ -1435,6 +1444,7 @@ const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int rea
(buffer[40] != '\0' && !isspace(buffer[40]))) { (buffer[40] != '\0' && !isspace(buffer[40]))) {
if (flag) if (flag)
*flag |= REF_ISBROKEN; *flag |= REF_ISBROKEN;
errno = EINVAL;
return NULL; return NULL;
} }
return refname; return refname;
@ -1447,6 +1457,7 @@ const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int rea
if (check_refname_format(buf, REFNAME_ALLOW_ONELEVEL)) { if (check_refname_format(buf, REFNAME_ALLOW_ONELEVEL)) {
if (flag) if (flag)
*flag |= REF_ISBROKEN; *flag |= REF_ISBROKEN;
errno = EINVAL;
return NULL; return NULL;
} }
refname = strcpy(refname_buffer, buf); refname = strcpy(refname_buffer, buf);