summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include/opkele/util.h10
-rw-r--r--lib/util.cc28
2 files changed, 37 insertions, 1 deletions
diff --git a/include/opkele/util.h b/include/opkele/util.h
index fd974a1..0130bff 100644
--- a/include/opkele/util.h
+++ b/include/opkele/util.h
@@ -31,7 +31,7 @@ namespace opkele {
31 time_t w3c_to_time(const string& w); 31 time_t w3c_to_time(const string& w);
32 32
33 /** 33 /**
34 * Encode string to the representation suitable for using in URL. 34 * Encode string to the representation suitable for using in URL
35 * @param str string to encode 35 * @param str string to encode
36 * @return encoded string 36 * @return encoded string
37 * @throw failed_conversion in case of failure 37 * @throw failed_conversion in case of failure
@@ -39,6 +39,14 @@ namespace opkele {
39 string url_encode(const string& str); 39 string url_encode(const string& str);
40 40
41 /** 41 /**
42 * Decode url-encoded string back to normal
43 * @param str url-encoded string
44 * @return decoded string
45 * @throw failed_conversion in case of failure
46 */
47 string url_decode(const string& str);
48
49 /**
42 * Make string suitable for using as x(ht)ml attribute. 50 * Make string suitable for using as x(ht)ml attribute.
43 * @param str string to escape 51 * @param str string to escape
44 * @return escaped string 52 * @return escaped string
diff --git a/lib/util.cc b/lib/util.cc
index a6e08e2..3e7f3aa 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -192,6 +192,34 @@ namespace opkele {
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;