about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorHarley Laue2008-04-29 17:59:53 +0200
committerLars Hjemli2008-04-29 17:59:53 +0200
commit112b2080626c62fff27cf8aaa9ac2fb07eb50b74 (patch)
treed683b43290e997a713c935c5163ca7cfcaaa3f3d
parentMerge branch 'lh/about' (diff)
downloadcgit-112b2080626c62fff27cf8aaa9ac2fb07eb50b74.tar.gz
cgit-112b2080626c62fff27cf8aaa9ac2fb07eb50b74.zip
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.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/html.c b/html.c index 937b5e7..bddb04d 100644 --- a/html.c +++ b/html.c
@@ -11,6 +11,7 @@
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
15int htmlfd = STDOUT_FILENO; 16int htmlfd = STDOUT_FILENO;
16 17
@@ -168,8 +169,11 @@ int html_include(const char *filename)
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);