diff options
author | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 18:08:30 +0100 |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 18:08:30 +0100 |
commit | 21f67e7d82986135922aece6b4ebf410a98705bc (patch) | |
tree | 67256f0ffbac072f1a19147079822d07bfe951ac | |
parent | Close fd on error in readfile() (diff) | |
download | cgit-pink-21f67e7d82986135922aece6b4ebf410a98705bc.tar.gz cgit-pink-21f67e7d82986135922aece6b4ebf410a98705bc.zip |
shared.c: return original errno
Noticed-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to '')
-rw-r--r-- | shared.c | 8 |
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 @@ -400,15 +400,16 @@ 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; fd = open(path, O_RDONLY); if (fd == -1) return errno; if (fstat(fd, &st)) { + e = errno; close(fd); - return errno; + return e; } if (!S_ISREG(st.st_mode)) { close(fd); @@ -416,7 +417,8 @@ 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); } |