|
diff --git a/html.c b/html.c index d7d9fd7..66ba65d 100644 --- a/ html.c+++ b/ html.c |
|
@@ -83,72 +83,74 @@ void html_txt(char *txt) |
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); |
94 | if (c=='>') |
94 | if (c=='>') |
95 | html(">"); |
95 | html(">"); |
96 | else if (c=='<') |
96 | else if (c=='<') |
97 | html("<"); |
97 | html("<"); |
98 | else if (c=='&') |
98 | else if (c=='&') |
99 | html("&"); |
99 | html("&"); |
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 | |
110 | void html_attr(char *txt) |
110 | void 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=='\'' || c=='\"') { |
116 | write(htmlfd, txt, t - txt); |
116 | write(htmlfd, txt, t - txt); |
117 | if (c=='>') |
117 | if (c=='>') |
118 | html(">"); |
118 | html(">"); |
119 | else if (c=='<') |
119 | else if (c=='<') |
120 | html("<"); |
120 | html("<"); |
121 | else if (c=='\'') |
121 | else if (c=='\'') |
122 | html(""e;"); |
122 | html("'"); |
| |
123 | else if (c=='"') |
| |
124 | html("""); |
123 | txt = t+1; |
125 | txt = t+1; |
124 | } |
126 | } |
125 | t++; |
127 | t++; |
126 | } |
128 | } |
127 | if (t!=txt) |
129 | if (t!=txt) |
128 | html(txt); |
130 | html(txt); |
129 | } |
131 | } |
130 | |
132 | |
131 | void html_url_path(char *txt) |
133 | void html_url_path(char *txt) |
132 | { |
134 | { |
133 | char *t = txt; |
135 | char *t = txt; |
134 | while(t && *t){ |
136 | while(t && *t){ |
135 | int c = *t; |
137 | int c = *t; |
136 | if (c=='"' || c=='#' || c=='\'' || c=='?') { |
138 | if (c=='"' || c=='#' || c=='\'' || c=='?') { |
137 | write(htmlfd, txt, t - txt); |
139 | write(htmlfd, txt, t - txt); |
138 | write(htmlfd, fmt("%%%2x", c), 3); |
140 | write(htmlfd, fmt("%%%2x", c), 3); |
139 | txt = t+1; |
141 | txt = t+1; |
140 | } |
142 | } |
141 | t++; |
143 | t++; |
142 | } |
144 | } |
143 | if (t!=txt) |
145 | if (t!=txt) |
144 | html(txt); |
146 | html(txt); |
145 | } |
147 | } |
146 | |
148 | |
147 | void html_url_arg(char *txt) |
149 | void html_url_arg(char *txt) |
148 | { |
150 | { |
149 | char *t = txt; |
151 | char *t = txt; |
150 | while(t && *t){ |
152 | while(t && *t){ |
151 | int c = *t; |
153 | int c = *t; |
152 | if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') { |
154 | if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') { |
153 | write(htmlfd, txt, t - txt); |
155 | write(htmlfd, txt, t - txt); |
154 | write(htmlfd, fmt("%%%2x", c), 3); |
156 | write(htmlfd, fmt("%%%2x", c), 3); |
|