author | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 14:35:36 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 14:35:36 (UTC) |
commit | 4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e (patch) (unidiff) | |
tree | 593616b5bd2e8c662d00478f50ecee86a0002224 /shared.c | |
parent | 13032727ffa81a4de8964d4002c359c0983cdeb2 (diff) | |
parent | 8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2 (diff) | |
download | cgit-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.zip cgit-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.tar.gz cgit-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | shared.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -407,11 +407,16 @@ int readfile(const char *path, char **buf, size_t *size) | |||
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 | close(fd); | ||
410 | return errno; | 411 | return errno; |
411 | if (!S_ISREG(st.st_mode)) | 412 | } |
413 | if (!S_ISREG(st.st_mode)) { | ||
414 | close(fd); | ||
412 | return EISDIR; | 415 | return EISDIR; |
416 | } | ||
413 | *buf = xmalloc(st.st_size + 1); | 417 | *buf = xmalloc(st.st_size + 1); |
414 | *size = read_in_full(fd, *buf, st.st_size); | 418 | *size = read_in_full(fd, *buf, st.st_size); |
415 | (*buf)[*size] = '\0'; | 419 | (*buf)[*size] = '\0'; |
420 | close(fd); | ||
416 | return (*size == st.st_size ? 0 : errno); | 421 | return (*size == st.st_size ? 0 : errno); |
417 | } | 422 | } |