author | Harley Laue <losinggeneration@aim.com> | 2008-04-29 15:59:53 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-04-29 15:59:53 (UTC) |
commit | 112b2080626c62fff27cf8aaa9ac2fb07eb50b74 (patch) (unidiff) | |
tree | d683b43290e997a713c935c5163ca7cfcaaa3f3d | |
parent | 905dbaef5aa33ea11d385b82de0188fee73dd655 (diff) | |
download | cgit-112b2080626c62fff27cf8aaa9ac2fb07eb50b74.zip cgit-112b2080626c62fff27cf8aaa9ac2fb07eb50b74.tar.gz cgit-112b2080626c62fff27cf8aaa9ac2fb07eb50b74.tar.bz2 |
Print an error if filename is not found in html_include.
Normally when html_include cannot open the file it fails silently and
things can be a bit hard to figure out from just looking at apache's
log. This will be beneficial for those initially setting up their server
with cgit.
Signed-off-by: Harley Laue <losinggeneration@aim.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | html.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -6,16 +6,17 @@ | |||
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <unistd.h> | 9 | #include <unistd.h> |
10 | #include <stdio.h> | 10 | #include <stdio.h> |
11 | #include <stdlib.h> | 11 | #include <stdlib.h> |
12 | #include <stdarg.h> | 12 | #include <stdarg.h> |
13 | #include <string.h> | 13 | #include <string.h> |
14 | #include <errno.h> | ||
14 | 15 | ||
15 | int htmlfd = STDOUT_FILENO; | 16 | int htmlfd = STDOUT_FILENO; |
16 | 17 | ||
17 | char *fmt(const char *format, ...) | 18 | char *fmt(const char *format, ...) |
18 | { | 19 | { |
19 | static char buf[8][1024]; | 20 | static char buf[8][1024]; |
20 | static int bufidx; | 21 | static int bufidx; |
21 | int len; | 22 | int len; |
@@ -163,18 +164,21 @@ void html_fileperm(unsigned short mode) | |||
163 | } | 164 | } |
164 | 165 | ||
165 | int html_include(const char *filename) | 166 | int html_include(const char *filename) |
166 | { | 167 | { |
167 | FILE *f; | 168 | FILE *f; |
168 | char buf[4096]; | 169 | char buf[4096]; |
169 | size_t len; | 170 | size_t len; |
170 | 171 | ||
171 | if (!(f = fopen(filename, "r"))) | 172 | if (!(f = fopen(filename, "r"))) { |
173 | fprintf(stderr, "[cgit] Failed to include file %s: %s (%d).\n", | ||
174 | filename, strerror(errno), errno); | ||
172 | return -1; | 175 | return -1; |
176 | } | ||
173 | while((len = fread(buf, 1, 4096, f)) > 0) | 177 | while((len = fread(buf, 1, 4096, f)) > 0) |
174 | write(htmlfd, buf, len); | 178 | write(htmlfd, buf, len); |
175 | fclose(f); | 179 | fclose(f); |
176 | return 0; | 180 | return 0; |
177 | } | 181 | } |
178 | 182 | ||
179 | int hextoint(char c) | 183 | int hextoint(char c) |
180 | { | 184 | { |