-rw-r--r-- | lib/util.cc | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/lib/util.cc b/lib/util.cc index a6e08e2..3e7f3aa 100644 --- a/lib/util.cc +++ b/lib/util.cc | |||
@@ -187,16 +187,44 @@ namespace opkele { | |||
187 | 187 | ||
188 | string url_encode(const string& str) { | 188 | string url_encode(const string& str) { |
189 | string rv; | 189 | string rv; |
190 | for_each(str.begin(),str.end(), | 190 | for_each(str.begin(),str.end(), |
191 | __url_encoder(rv)); | 191 | __url_encoder(rv)); |
192 | return rv; | 192 | return rv; |
193 | } | 193 | } |
194 | 194 | ||
195 | string url_decode(const string& str) { | ||
196 | string rv; | ||
197 | back_insert_iterator<string> ii(rv); | ||
198 | for(string::const_iterator i=str.begin(),ie=str.end(); | ||
199 | i!=ie;++i) { | ||
200 | switch(*i) { | ||
201 | case '+': | ||
202 | *(ii++) = ' '; break; | ||
203 | case '%': | ||
204 | ++i; | ||
205 | static char tmp[3] = {0,0,0}; | ||
206 | if(i==ie) | ||
207 | throw failed_conversion(OPKELE_CP_ "trailing percent in the url-encoded string"); | ||
208 | tmp[0] == *(i++); | ||
209 | if(i==ie) | ||
210 | throw failed_conversion(OPKELE_CP_ "not enough hexadecimals after the percent sign in url-encoded string"); | ||
211 | tmp[1] == *i; | ||
212 | if(!(isxdigit(tmp[0]) && isxdigit(tmp[1]))) | ||
213 | throw failed_conversion(OPKELE_CP_ "non-hex follows percent in url-encoded string"); | ||
214 | *(ii++) = strtol(tmp,0,16); | ||
215 | break; | ||
216 | default: | ||
217 | *(ii++) = *i; break; | ||
218 | } | ||
219 | } | ||
220 | return rv; | ||
221 | } | ||
222 | |||
195 | string attr_escape(const string& str) { | 223 | string attr_escape(const string& str) { |
196 | static const char *unsafechars = "<>&\n\"'"; | 224 | static const char *unsafechars = "<>&\n\"'"; |
197 | string rv; | 225 | string rv; |
198 | string::size_type p=0; | 226 | string::size_type p=0; |
199 | while(true) { | 227 | while(true) { |
200 | string::size_type us = str.find_first_of(unsafechars,p); | 228 | string::size_type us = str.find_first_of(unsafechars,p); |
201 | if(us==string::npos) { | 229 | if(us==string::npos) { |
202 | if(p!=str.length()) | 230 | if(p!=str.length()) |