author | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 17:16:50 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 17:16:50 (UTC) |
commit | e633ccf714eb423c4522924c3b611dac2e176c5e (patch) (unidiff) | |
tree | 096e7acc625b790e6860fe446f56775d578b60ff /shared.c | |
parent | 59310ab102a448d90c337b3b138dd53681d8097e (diff) | |
parent | 21f67e7d82986135922aece6b4ebf410a98705bc (diff) | |
download | cgit-e633ccf714eb423c4522924c3b611dac2e176c5e.zip cgit-e633ccf714eb423c4522924c3b611dac2e176c5e.tar.gz cgit-e633ccf714eb423c4522924c3b611dac2e176c5e.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | shared.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -379,44 +379,46 @@ int cgit_open_filter(struct cgit_filter *filter) | |||
379 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), | 379 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), |
380 | "Unable to use pipe as STDOUT"); | 380 | "Unable to use pipe as STDOUT"); |
381 | close(filter->pipe_fh[1]); | 381 | close(filter->pipe_fh[1]); |
382 | return 0; | 382 | return 0; |
383 | } | 383 | } |
384 | 384 | ||
385 | int cgit_close_filter(struct cgit_filter *filter) | 385 | int cgit_close_filter(struct cgit_filter *filter) |
386 | { | 386 | { |
387 | chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), | 387 | chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), |
388 | "Unable to restore STDOUT"); | 388 | "Unable to restore STDOUT"); |
389 | close(filter->old_stdout); | 389 | close(filter->old_stdout); |
390 | if (filter->pid < 0) | 390 | if (filter->pid < 0) |
391 | return 0; | 391 | return 0; |
392 | waitpid(filter->pid, &filter->exitstatus, 0); | 392 | waitpid(filter->pid, &filter->exitstatus, 0); |
393 | if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) | 393 | if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) |
394 | return 0; | 394 | return 0; |
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 | } |