Unidiff1 files changed, 5 insertions, 3 deletions
|
diff --git a/shared.c b/shared.c index a27ab30..9362d21 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -395,28 +395,30 @@ int cgit_close_filter(struct cgit_filter *filter) |
395 | die("Subprocess %s exited abnormally", filter->cmd); |
395 | die("Subprocess %s exited abnormally", filter->cmd); |
396 | } |
396 | } |
397 | |
397 | |
398 | /* Read the content of the specified file into a newly allocated buffer, |
398 | /* Read the content of the specified file into a newly allocated buffer, |
399 | * zeroterminate the buffer and return 0 on success, errno otherwise. |
399 | * zeroterminate the buffer and return 0 on success, errno otherwise. |
400 | */ |
400 | */ |
401 | int readfile(const char *path, char **buf, size_t *size) |
401 | int 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 | e = errno; |
410 | close(fd); |
411 | close(fd); |
411 | return errno; |
412 | return e; |
412 | } |
413 | } |
413 | if (!S_ISREG(st.st_mode)) { |
414 | if (!S_ISREG(st.st_mode)) { |
414 | close(fd); |
415 | close(fd); |
415 | return EISDIR; |
416 | return EISDIR; |
416 | } |
417 | } |
417 | *buf = xmalloc(st.st_size + 1); |
418 | *buf = xmalloc(st.st_size + 1); |
418 | *size = read_in_full(fd, *buf, st.st_size); |
419 | *size = read_in_full(fd, *buf, st.st_size); |
| |
420 | e = errno; |
419 | (*buf)[*size] = '\0'; |
421 | (*buf)[*size] = '\0'; |
420 | close(fd); |
422 | close(fd); |
421 | return (*size == st.st_size ? 0 : errno); |
423 | return (*size == st.st_size ? 0 : e); |
422 | } |
424 | } |
|