-rw-r--r-- | lib/util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.cc b/lib/util.cc index a46ba2a..249eeed 100644 --- a/lib/util.cc +++ b/lib/util.cc | |||
@@ -189,56 +189,56 @@ namespace opkele { | |||
189 | __url_encoder(string& r) : rv(r) { } | 189 | __url_encoder(string& r) : rv(r) { } |
190 | 190 | ||
191 | result_type operator()(argument_type c) { | 191 | result_type operator()(argument_type c) { |
192 | if(isrfc3986unreserved(c)) | 192 | if(isrfc3986unreserved(c)) |
193 | rv += c; | 193 | rv += c; |
194 | else{ | 194 | else{ |
195 | char tmp[4]; | 195 | char tmp[4]; |
196 | snprintf(tmp,sizeof(tmp),"%%%02X", | 196 | snprintf(tmp,sizeof(tmp),"%%%02X", |
197 | (c&0xff)); | 197 | (c&0xff)); |
198 | rv += tmp; | 198 | rv += tmp; |
199 | } | 199 | } |
200 | } | 200 | } |
201 | }; | 201 | }; |
202 | 202 | ||
203 | string url_encode(const string& str) { | 203 | string url_encode(const string& str) { |
204 | string rv; | 204 | string rv; |
205 | for_each(str.begin(),str.end(), | 205 | for_each(str.begin(),str.end(), |
206 | __url_encoder(rv)); | 206 | __url_encoder(rv)); |
207 | return rv; | 207 | return rv; |
208 | } | 208 | } |
209 | 209 | ||
210 | string url_decode(const string& str) { | 210 | string url_decode(const string& str) { |
211 | string rv; | 211 | string rv; |
212 | back_insert_iterator<string> ii(rv); | 212 | back_insert_iterator<string> ii(rv); |
213 | char tmp[3]; tmp[2] = 0; | ||
213 | for(string::const_iterator i=str.begin(),ie=str.end(); | 214 | for(string::const_iterator i=str.begin(),ie=str.end(); |
214 | i!=ie;++i) { | 215 | i!=ie;++i) { |
215 | switch(*i) { | 216 | switch(*i) { |
216 | case '+': | 217 | case '+': |
217 | *(ii++) = ' '; break; | 218 | *(ii++) = ' '; break; |
218 | case '%': | 219 | case '%': |
219 | ++i; | 220 | ++i; |
220 | static char tmp[3] = {0,0,0}; | ||
221 | if(i==ie) | 221 | if(i==ie) |
222 | throw failed_conversion(OPKELE_CP_ "trailing percent in the url-encoded string"); | 222 | throw failed_conversion(OPKELE_CP_ "trailing percent in the url-encoded string"); |
223 | tmp[0] = *(i++); | 223 | tmp[0] = *(i++); |
224 | if(i==ie) | 224 | if(i==ie) |
225 | throw failed_conversion(OPKELE_CP_ "not enough hexadecimals after the percent sign in url-encoded string"); | 225 | throw failed_conversion(OPKELE_CP_ "not enough hexadecimals after the percent sign in url-encoded string"); |
226 | tmp[1] = *i; | 226 | tmp[1] = *i; |
227 | if(!(isxdigit(tmp[0]) && isxdigit(tmp[1]))) | 227 | if(!(isxdigit(tmp[0]) && isxdigit(tmp[1]))) |
228 | throw failed_conversion(OPKELE_CP_ "non-hex follows percent in url-encoded string"); | 228 | throw failed_conversion(OPKELE_CP_ "non-hex follows percent in url-encoded string"); |
229 | *(ii++) = (char)strtol(tmp,0,16); | 229 | *(ii++) = (char)strtol(tmp,0,16); |
230 | break; | 230 | break; |
231 | default: | 231 | default: |
232 | *(ii++) = *i; break; | 232 | *(ii++) = *i; break; |
233 | } | 233 | } |
234 | } | 234 | } |
235 | return rv; | 235 | return rv; |
236 | } | 236 | } |
237 | 237 | ||
238 | string attr_escape(const string& str) { | 238 | string attr_escape(const string& str) { |
239 | static const char *unsafechars = "<>&\n\"'"; | 239 | static const char *unsafechars = "<>&\n\"'"; |
240 | string rv; | 240 | string rv; |
241 | string::size_type p=0; | 241 | string::size_type p=0; |
242 | while(true) { | 242 | while(true) { |
243 | string::size_type us = str.find_first_of(unsafechars,p); | 243 | string::size_type us = str.find_first_of(unsafechars,p); |
244 | if(us==string::npos) { | 244 | if(us==string::npos) { |