diff options
| author | 2009-11-08 02:08:30 (JST) | |
|---|---|---|
| committer | 2009-11-08 02:08:30 (JST) | |
| commit | 21f67e7d82986135922aece6b4ebf410a98705bc (patch) | |
| tree | 67256f0ffbac072f1a19147079822d07bfe951ac | |
| parent | 8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2 (diff) | |
| download | cgit-21f67e7d82986135922aece6b4ebf410a98705bc.zip cgit-21f67e7d82986135922aece6b4ebf410a98705bc.tar.gz | |
shared.c: return original errno
Noticed-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| -rw-r--r-- | shared.c | 8 |
1 files changed, 5 insertions, 3 deletions
| @@ -400,15 +400,16 @@ int cgit_close_filter(struct cgit_filter *filter) | |||
| 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); |
| @@ -416,7 +417,8 @@ int readfile(const char *path, char **buf, size_t *size) | |||
| 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 | } |
