summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-11-07 17:08:30 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-11-07 17:08:30 (UTC)
commit21f67e7d82986135922aece6b4ebf410a98705bc (patch) (side-by-side diff)
tree67256f0ffbac072f1a19147079822d07bfe951ac
parent8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2 (diff)
downloadcgit-21f67e7d82986135922aece6b4ebf410a98705bc.zip
cgit-21f67e7d82986135922aece6b4ebf410a98705bc.tar.gz
cgit-21f67e7d82986135922aece6b4ebf410a98705bc.tar.bz2
shared.c: return original errno
Noticed-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--shared.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/shared.c b/shared.c
index a27ab30..9362d21 100644
--- a/shared.c
+++ b/shared.c
@@ -401,5 +401,5 @@ int cgit_close_filter(struct cgit_filter *filter)
int readfile(const char *path, char **buf, size_t *size)
{
- int fd;
+ int fd, e;
struct stat st;
@@ -408,6 +408,7 @@ int readfile(const char *path, char **buf, size_t *size)
return errno;
if (fstat(fd, &st)) {
+ e = errno;
close(fd);
- return errno;
+ return e;
}
if (!S_ISREG(st.st_mode)) {
@@ -417,6 +418,7 @@ int readfile(const char *path, char **buf, size_t *size)
*buf = xmalloc(st.st_size + 1);
*size = read_in_full(fd, *buf, st.st_size);
+ e = errno;
(*buf)[*size] = '\0';
close(fd);
- return (*size == st.st_size ? 0 : errno);
+ return (*size == st.st_size ? 0 : e);
}