aboutsummaryrefslogtreecommitdiffstats
path: root/shared.c
diff options
context:
space:
mode:
Diffstat (limited to 'shared.c')
-rw-r--r--shared.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/shared.c b/shared.c
index d7b2d5a..9362d21 100644
--- a/shared.c
+++ b/shared.c
@@ -400,18 +400,25 @@ int cgit_close_filter(struct cgit_filter *filter)
400 */ 400 */
401int readfile(const char *path, char **buf, size_t *size) 401int readfile(const char *path, char **buf, size_t *size)
402{ 402{
403 int fd; 403 int fd, e;
404 struct stat st; 404 struct stat st;
405 405
406 fd = open(path, O_RDONLY); 406 fd = open(path, O_RDONLY);
407 if (fd == -1) 407 if (fd == -1)
408 return errno; 408 return errno;
409 if (fstat(fd, &st)) 409 if (fstat(fd, &st)) {
410 return errno; 410 e = errno;
411 if (!S_ISREG(st.st_mode)) 411 close(fd);
412 return e;
413 }
414 if (!S_ISREG(st.st_mode)) {
415 close(fd);
412 return EISDIR; 416 return EISDIR;
417 }
413 *buf = xmalloc(st.st_size + 1); 418 *buf = xmalloc(st.st_size + 1);
414 *size = read_in_full(fd, *buf, st.st_size); 419 *size = read_in_full(fd, *buf, st.st_size);
420 e = errno;
415 (*buf)[*size] = '\0'; 421 (*buf)[*size] = '\0';
416 return (*size == st.st_size ? 0 : errno); 422 close(fd);
423 return (*size == st.st_size ? 0 : e);
417} 424}