|
diff --git a/html.c b/html.c index eaabf72..1305910 100644 --- a/ html.c+++ b/ html.c |
|
@@ -94,9 +94,9 @@ void html_txt(const char *txt) |
94 | const char *t = txt; |
94 | const char *t = txt; |
95 | while(t && *t){ |
95 | while(t && *t){ |
96 | int c = *t; |
96 | int c = *t; |
97 | if (c=='<' || c=='>' || c=='&') { |
97 | if (c=='<' || c=='>' || c=='&') { |
98 | write(htmlfd, txt, t - txt); |
98 | html_raw(txt, t - txt); |
99 | if (c=='>') |
99 | if (c=='>') |
100 | html(">"); |
100 | html(">"); |
101 | else if (c=='<') |
101 | else if (c=='<') |
102 | html("<"); |
102 | html("<"); |
@@ -115,9 +115,9 @@ void html_ntxt(int len, const char *txt) |
115 | const char *t = txt; |
115 | const char *t = txt; |
116 | while(t && *t && len--){ |
116 | while(t && *t && len--){ |
117 | int c = *t; |
117 | int c = *t; |
118 | if (c=='<' || c=='>' || c=='&') { |
118 | if (c=='<' || c=='>' || c=='&') { |
119 | write(htmlfd, txt, t - txt); |
119 | html_raw(txt, t - txt); |
120 | if (c=='>') |
120 | if (c=='>') |
121 | html(">"); |
121 | html(">"); |
122 | else if (c=='<') |
122 | else if (c=='<') |
123 | html("<"); |
123 | html("<"); |
@@ -127,9 +127,9 @@ void html_ntxt(int len, const char *txt) |
127 | } |
127 | } |
128 | t++; |
128 | t++; |
129 | } |
129 | } |
130 | if (t!=txt) |
130 | if (t!=txt) |
131 | write(htmlfd, txt, t - txt); |
131 | html_raw(txt, t - txt); |
132 | if (len<0) |
132 | if (len<0) |
133 | html("..."); |
133 | html("..."); |
134 | } |
134 | } |
135 | |
135 | |
@@ -138,9 +138,9 @@ void html_attr(const char *txt) |
138 | const char *t = txt; |
138 | const char *t = txt; |
139 | while(t && *t){ |
139 | while(t && *t){ |
140 | int c = *t; |
140 | int c = *t; |
141 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { |
141 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { |
142 | write(htmlfd, txt, t - txt); |
142 | html_raw(txt, t - txt); |
143 | if (c=='>') |
143 | if (c=='>') |
144 | html(">"); |
144 | html(">"); |
145 | else if (c=='<') |
145 | else if (c=='<') |
146 | html("<"); |
146 | html("<"); |
@@ -162,10 +162,10 @@ void html_url_path(const char *txt) |
162 | while(t && *t){ |
162 | while(t && *t){ |
163 | int c = *t; |
163 | int c = *t; |
164 | const char *e = url_escape_table[c]; |
164 | const char *e = url_escape_table[c]; |
165 | if (e && c!='+' && c!='&' && c!='+') { |
165 | if (e && c!='+' && c!='&' && c!='+') { |
166 | write(htmlfd, txt, t - txt); |
166 | html_raw(txt, t - txt); |
167 | write(htmlfd, e, 3); |
167 | html_raw(e, 3); |
168 | txt = t+1; |
168 | txt = t+1; |
169 | } |
169 | } |
170 | t++; |
170 | t++; |
171 | } |
171 | } |
@@ -179,10 +179,10 @@ void html_url_arg(const char *txt) |
179 | while(t && *t){ |
179 | while(t && *t){ |
180 | int c = *t; |
180 | int c = *t; |
181 | const char *e = url_escape_table[c]; |
181 | const char *e = url_escape_table[c]; |
182 | if (e) { |
182 | if (e) { |
183 | write(htmlfd, txt, t - txt); |
183 | html_raw(txt, t - txt); |
184 | write(htmlfd, e, 3); |
184 | html_raw(e, 3); |
185 | txt = t+1; |
185 | txt = t+1; |
186 | } |
186 | } |
187 | t++; |
187 | t++; |
188 | } |
188 | } |
@@ -248,9 +248,9 @@ int html_include(const char *filename) |
248 | filename, strerror(errno), errno); |
248 | filename, strerror(errno), errno); |
249 | return -1; |
249 | return -1; |
250 | } |
250 | } |
251 | while((len = fread(buf, 1, 4096, f)) > 0) |
251 | while((len = fread(buf, 1, 4096, f)) > 0) |
252 | write(htmlfd, buf, len); |
252 | html_raw(buf, len); |
253 | fclose(f); |
253 | fclose(f); |
254 | return 0; |
254 | return 0; |
255 | } |
255 | } |
256 | |
256 | |
|