|
diff --git a/html.c b/html.c index 83fc7a9..36e9a2f 100644 --- a/ html.c+++ b/ html.c |
|
@@ -27,67 +27,67 @@ char *fmt(const char *format, ...) |
27 | |
27 | |
28 | va_start(args, format); |
28 | va_start(args, format); |
29 | len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args); |
29 | len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args); |
30 | va_end(args); |
30 | va_end(args); |
31 | if (len>sizeof(buf[bufidx])) { |
31 | if (len>sizeof(buf[bufidx])) { |
32 | fprintf(stderr, "[html.c] string truncated: %s\n", format); |
32 | fprintf(stderr, "[html.c] string truncated: %s\n", format); |
33 | exit(1); |
33 | exit(1); |
34 | } |
34 | } |
35 | return buf[bufidx]; |
35 | return buf[bufidx]; |
36 | } |
36 | } |
37 | |
37 | |
38 | void html_raw(const char *data, size_t size) |
38 | void html_raw(const char *data, size_t size) |
39 | { |
39 | { |
40 | write(htmlfd, data, size); |
40 | write(htmlfd, data, size); |
41 | } |
41 | } |
42 | |
42 | |
43 | void html(const char *txt) |
43 | void html(const char *txt) |
44 | { |
44 | { |
45 | write(htmlfd, txt, strlen(txt)); |
45 | write(htmlfd, txt, strlen(txt)); |
46 | } |
46 | } |
47 | |
47 | |
48 | void htmlf(const char *format, ...) |
48 | void htmlf(const char *format, ...) |
49 | { |
49 | { |
50 | static char buf[65536]; |
50 | static char buf[65536]; |
51 | va_list args; |
51 | va_list args; |
52 | |
52 | |
53 | va_start(args, format); |
53 | va_start(args, format); |
54 | vsnprintf(buf, sizeof(buf), format, args); |
54 | vsnprintf(buf, sizeof(buf), format, args); |
55 | va_end(args); |
55 | va_end(args); |
56 | html(buf); |
56 | html(buf); |
57 | } |
57 | } |
58 | |
58 | |
59 | void html_status(int code, int more_headers) |
59 | void html_status(int code, const char *msg, int more_headers) |
60 | { |
60 | { |
61 | htmlf("Status: %d\n", code); |
61 | htmlf("Status: %d %s\n", code, msg); |
62 | if (!more_headers) |
62 | if (!more_headers) |
63 | html("\n"); |
63 | html("\n"); |
64 | } |
64 | } |
65 | |
65 | |
66 | void html_txt(char *txt) |
66 | void html_txt(char *txt) |
67 | { |
67 | { |
68 | char *t = txt; |
68 | char *t = txt; |
69 | while(t && *t){ |
69 | while(t && *t){ |
70 | int c = *t; |
70 | int c = *t; |
71 | if (c=='<' || c=='>' || c=='&') { |
71 | if (c=='<' || c=='>' || c=='&') { |
72 | write(htmlfd, txt, t - txt); |
72 | write(htmlfd, txt, t - txt); |
73 | if (c=='>') |
73 | if (c=='>') |
74 | html(">"); |
74 | html(">"); |
75 | else if (c=='<') |
75 | else if (c=='<') |
76 | html("<"); |
76 | html("<"); |
77 | else if (c=='&') |
77 | else if (c=='&') |
78 | html("&"); |
78 | html("&"); |
79 | txt = t+1; |
79 | txt = t+1; |
80 | } |
80 | } |
81 | t++; |
81 | t++; |
82 | } |
82 | } |
83 | if (t!=txt) |
83 | if (t!=txt) |
84 | html(txt); |
84 | html(txt); |
85 | } |
85 | } |
86 | |
86 | |
87 | void html_ntxt(int len, char *txt) |
87 | void html_ntxt(int len, char *txt) |
88 | { |
88 | { |
89 | char *t = txt; |
89 | char *t = txt; |
90 | while(t && *t && len--){ |
90 | while(t && *t && len--){ |
91 | int c = *t; |
91 | int c = *t; |
92 | if (c=='<' || c=='>' || c=='&') { |
92 | if (c=='<' || c=='>' || c=='&') { |
93 | write(htmlfd, txt, t - txt); |
93 | write(htmlfd, txt, t - txt); |
|