summaryrefslogtreecommitdiffabout
authorHarley Laue <losinggeneration@aim.com>2008-04-29 15:59:53 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-04-29 15:59:53 (UTC)
commit112b2080626c62fff27cf8aaa9ac2fb07eb50b74 (patch) (unidiff)
treed683b43290e997a713c935c5163ca7cfcaaa3f3d
parent905dbaef5aa33ea11d385b82de0188fee73dd655 (diff)
downloadcgit-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>
Diffstat (more/less context) (ignore whitespace changes)
-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
@@ -1,29 +1,30 @@
1/* html.c: helper functions for html output 1/* html.c: helper functions for html output
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 <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
15int htmlfd = STDOUT_FILENO; 16int htmlfd = STDOUT_FILENO;
16 17
17char *fmt(const char *format, ...) 18char *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;
22 va_list args; 23 va_list args;
23 24
24 bufidx++; 25 bufidx++;
25 bufidx &= 7; 26 bufidx &= 7;
26 27
27 va_start(args, format); 28 va_start(args, format);
28 len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args); 29 len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args);
29 va_end(args); 30 va_end(args);
@@ -155,34 +156,37 @@ void html_link_close(void)
155{ 156{
156 html("</a>"); 157 html("</a>");
157} 158}
158 159
159void html_fileperm(unsigned short mode) 160void html_fileperm(unsigned short mode)
160{ 161{
161 htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), 162 htmlf("%c%c%c", (mode & 4 ? 'r' : '-'),
162 (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); 163 (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-'));
163} 164}
164 165
165int html_include(const char *filename) 166int 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
179int hextoint(char c) 183int hextoint(char c)
180{ 184{
181 if (c >= 'a' && c <= 'f') 185 if (c >= 'a' && c <= 'f')
182 return 10 + c - 'a'; 186 return 10 + c - 'a';
183 else if (c >= 'A' && c <= 'F') 187 else if (c >= 'A' && c <= 'F')
184 return 10 + c - 'A'; 188 return 10 + c - 'A';
185 else if (c >= '0' && c <= '9') 189 else if (c >= '0' && c <= '9')
186 return c - '0'; 190 return c - '0';
187 else 191 else
188 return -1; 192 return -1;