summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-11-07 14:35:36 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-11-07 14:35:36 (UTC)
commit4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e (patch) (unidiff)
tree593616b5bd2e8c662d00478f50ecee86a0002224
parent13032727ffa81a4de8964d4002c359c0983cdeb2 (diff)
parent8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2 (diff)
downloadcgit-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.zip
cgit-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.tar.gz
cgit-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--shared.c9
-rw-r--r--ui-shared.c2
2 files changed, 8 insertions, 3 deletions
diff --git a/shared.c b/shared.c
index d7b2d5a..a27ab30 100644
--- a/shared.c
+++ b/shared.c
@@ -385,33 +385,38 @@ int cgit_open_filter(struct cgit_filter *filter)
385int cgit_close_filter(struct cgit_filter *filter) 385int 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 */
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;
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 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}
diff --git a/ui-shared.c b/ui-shared.c
index 6cb7edb..3a9e67b 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1,47 +1,47 @@
1/* ui-shared.c: common web output functions 1/* ui-shared.c: common web output functions
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "cmd.h" 10#include "cmd.h"
11#include "html.h" 11#include "html.h"
12 12
13const char cgit_doctype[] = 13const char cgit_doctype[] =
14"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" 14"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
15" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; 15" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
16 16
17static char *http_date(time_t t) 17static char *http_date(time_t t)
18{ 18{
19 static char day[][4] = 19 static char day[][4] =
20 {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; 20 {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
21 static char month[][4] = 21 static char month[][4] =
22 {"Jan", "Feb", "Mar", "Apr", "May", "Jun", 22 {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
23 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; 23 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
24 struct tm *tm = gmtime(&t); 24 struct tm *tm = gmtime(&t);
25 return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], 25 return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
26 tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, 26 tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
27 tm->tm_hour, tm->tm_min, tm->tm_sec); 27 tm->tm_hour, tm->tm_min, tm->tm_sec);
28} 28}
29 29
30void cgit_print_error(char *msg) 30void cgit_print_error(char *msg)
31{ 31{
32 html("<div class='error'>"); 32 html("<div class='error'>");
33 html_txt(msg); 33 html_txt(msg);
34 html("</div>\n"); 34 html("</div>\n");
35} 35}
36 36
37char *cgit_httpscheme() 37char *cgit_httpscheme()
38{ 38{
39 if (ctx.env.https && !strcmp(ctx.env.https, "on")) 39 if (ctx.env.https && !strcmp(ctx.env.https, "on"))
40 return "https://"; 40 return "https://";
41 else 41 else
42 return "http://"; 42 return "http://";
43} 43}
44 44
45char *cgit_hosturl() 45char *cgit_hosturl()
46{ 46{
47 if (ctx.env.http_host) 47 if (ctx.env.http_host)