summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--html.c16
-rw-r--r--html.h1
2 files changed, 17 insertions, 0 deletions
diff --git a/html.c b/html.c
index 36e9a2f..167127f 100644
--- a/html.c
+++ b/html.c
@@ -83,96 +83,112 @@ void html_txt(char *txt)
83 if (t!=txt) 83 if (t!=txt)
84 html(txt); 84 html(txt);
85} 85}
86 86
87void html_ntxt(int len, char *txt) 87void 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);
94 if (c=='>') 94 if (c=='>')
95 html("&gt;"); 95 html("&gt;");
96 else if (c=='<') 96 else if (c=='<')
97 html("&lt;"); 97 html("&lt;");
98 else if (c=='&') 98 else if (c=='&')
99 html("&amp;"); 99 html("&amp;");
100 txt = t+1; 100 txt = t+1;
101 } 101 }
102 t++; 102 t++;
103 } 103 }
104 if (t!=txt) 104 if (t!=txt)
105 write(htmlfd, txt, t - txt); 105 write(htmlfd, txt, t - txt);
106 if (len<0) 106 if (len<0)
107 html("..."); 107 html("...");
108} 108}
109 109
110void html_attr(char *txt) 110void html_attr(char *txt)
111{ 111{
112 char *t = txt; 112 char *t = txt;
113 while(t && *t){ 113 while(t && *t){
114 int c = *t; 114 int c = *t;
115 if (c=='<' || c=='>' || c=='\'') { 115 if (c=='<' || c=='>' || c=='\'') {
116 write(htmlfd, txt, t - txt); 116 write(htmlfd, txt, t - txt);
117 if (c=='>') 117 if (c=='>')
118 html("&gt;"); 118 html("&gt;");
119 else if (c=='<') 119 else if (c=='<')
120 html("&lt;"); 120 html("&lt;");
121 else if (c=='\'') 121 else if (c=='\'')
122 html("&quote;"); 122 html("&quote;");
123 txt = t+1; 123 txt = t+1;
124 } 124 }
125 t++; 125 t++;
126 } 126 }
127 if (t!=txt) 127 if (t!=txt)
128 html(txt); 128 html(txt);
129} 129}
130 130
131void html_url_arg(char *txt)
132{
133 char *t = txt;
134 while(t && *t){
135 int c = *t;
136 if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') {
137 write(htmlfd, txt, t - txt);
138 write(htmlfd, fmt("%%%2x", c), 3);
139 txt = t+1;
140 }
141 t++;
142 }
143 if (t!=txt)
144 html(txt);
145}
146
131void html_hidden(char *name, char *value) 147void html_hidden(char *name, char *value)
132{ 148{
133 html("<input type='hidden' name='"); 149 html("<input type='hidden' name='");
134 html_attr(name); 150 html_attr(name);
135 html("' value='"); 151 html("' value='");
136 html_attr(value); 152 html_attr(value);
137 html("'/>"); 153 html("'/>");
138} 154}
139 155
140void html_option(char *value, char *text, char *selected_value) 156void html_option(char *value, char *text, char *selected_value)
141{ 157{
142 html("<option value='"); 158 html("<option value='");
143 html_attr(value); 159 html_attr(value);
144 html("'"); 160 html("'");
145 if (selected_value && !strcmp(selected_value, value)) 161 if (selected_value && !strcmp(selected_value, value))
146 html(" selected='selected'"); 162 html(" selected='selected'");
147 html(">"); 163 html(">");
148 html_txt(text); 164 html_txt(text);
149 html("</option>\n"); 165 html("</option>\n");
150} 166}
151 167
152void html_link_open(char *url, char *title, char *class) 168void html_link_open(char *url, char *title, char *class)
153{ 169{
154 html("<a href='"); 170 html("<a href='");
155 html_attr(url); 171 html_attr(url);
156 if (title) { 172 if (title) {
157 html("' title='"); 173 html("' title='");
158 html_attr(title); 174 html_attr(title);
159 } 175 }
160 if (class) { 176 if (class) {
161 html("' class='"); 177 html("' class='");
162 html_attr(class); 178 html_attr(class);
163 } 179 }
164 html("'>"); 180 html("'>");
165} 181}
166 182
167void html_link_close(void) 183void html_link_close(void)
168{ 184{
169 html("</a>"); 185 html("</a>");
170} 186}
171 187
172void html_fileperm(unsigned short mode) 188void html_fileperm(unsigned short mode)
173{ 189{
174 htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), 190 htmlf("%c%c%c", (mode & 4 ? 'r' : '-'),
175 (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); 191 (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-'));
176} 192}
177 193
178int html_include(const char *filename) 194int html_include(const char *filename)
diff --git a/html.h b/html.h
index 3c32935..038cf60 100644
--- a/html.h
+++ b/html.h
@@ -1,22 +1,23 @@
1#ifndef HTML_H 1#ifndef HTML_H
2#define HTML_H 2#define HTML_H
3 3
4extern int htmlfd; 4extern int htmlfd;
5 5
6extern void html_raw(const char *txt, size_t size); 6extern void html_raw(const char *txt, size_t size);
7extern void html(const char *txt); 7extern void html(const char *txt);
8extern void htmlf(const char *format,...); 8extern void htmlf(const char *format,...);
9extern void html_status(int code, const char *msg, int more_headers); 9extern void html_status(int code, const char *msg, int more_headers);
10extern void html_txt(char *txt); 10extern void html_txt(char *txt);
11extern void html_ntxt(int len, char *txt); 11extern void html_ntxt(int len, char *txt);
12extern void html_attr(char *txt); 12extern void html_attr(char *txt);
13extern void html_url_arg(char *txt);
13extern void html_hidden(char *name, char *value); 14extern void html_hidden(char *name, char *value);
14extern void html_option(char *value, char *text, char *selected_value); 15extern void html_option(char *value, char *text, char *selected_value);
15extern void html_link_open(char *url, char *title, char *class); 16extern void html_link_open(char *url, char *title, char *class);
16extern void html_link_close(void); 17extern void html_link_close(void);
17extern void html_fileperm(unsigned short mode); 18extern void html_fileperm(unsigned short mode);
18extern int html_include(const char *filename); 19extern int html_include(const char *filename);
19 20
20extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)); 21extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value));
21 22
22#endif /* HTML_H */ 23#endif /* HTML_H */