|
diff --git a/html.c b/html.c index 937b5e7..bddb04d 100644 --- a/ html.c+++ b/ html.c |
|
@@ -1,37 +1,38 @@ |
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 | |
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; |
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); |
30 | if (len>sizeof(buf[bufidx])) { |
31 | if (len>sizeof(buf[bufidx])) { |
31 | fprintf(stderr, "[html.c] string truncated: %s\n", format); |
32 | fprintf(stderr, "[html.c] string truncated: %s\n", format); |
32 | exit(1); |
33 | exit(1); |
33 | } |
34 | } |
34 | return buf[bufidx]; |
35 | return buf[bufidx]; |
35 | } |
36 | } |
36 | |
37 | |
37 | void html(const char *txt) |
38 | void html(const char *txt) |
@@ -147,50 +148,53 @@ void html_link_open(char *url, char *title, char *class) |
147 | if (class) { |
148 | if (class) { |
148 | html("' class='"); |
149 | html("' class='"); |
149 | html_attr(class); |
150 | html_attr(class); |
150 | } |
151 | } |
151 | html("'>"); |
152 | html("'>"); |
152 | } |
153 | } |
153 | |
154 | |
154 | void html_link_close(void) |
155 | void html_link_close(void) |
155 | { |
156 | { |
156 | html("</a>"); |
157 | html("</a>"); |
157 | } |
158 | } |
158 | |
159 | |
159 | void html_fileperm(unsigned short mode) |
160 | void 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 | |
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 | { |
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; |
189 | } |
193 | } |
190 | |
194 | |
191 | char *convert_query_hexchar(char *txt) |
195 | char *convert_query_hexchar(char *txt) |
192 | { |
196 | { |
193 | int d1, d2; |
197 | int d1, d2; |
194 | if (strlen(txt) < 3) { |
198 | if (strlen(txt) < 3) { |
195 | *txt = '\0'; |
199 | *txt = '\0'; |
196 | return txt-1; |
200 | return txt-1; |
|