all repos — cgit @ e633ccf714eb423c4522924c3b611dac2e176c5e

a hyperfast web frontend for git written in c

Merge branch 'stable'
Lars Hjemli hjemli@gmail.com
Sat, 07 Nov 2009 18:16:50 +0100
commit

e633ccf714eb423c4522924c3b611dac2e176c5e

parent

59310ab102a448d90c337b3b138dd53681d8097e

1 files changed, 5 insertions(+), 3 deletions(-)

jump to
M shared.cshared.c

@@ -400,15 +400,16 @@ * zeroterminate the buffer and return 0 on success, errno otherwise.

*/ 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 @@ return EISDIR;

} *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); }