summaryrefslogtreecommitdiffabout
path: root/lib
Unidiff
Diffstat (limited to 'lib') (more/less context) (ignore whitespace changes)
-rw-r--r--lib/util.cc39
1 files changed, 33 insertions, 6 deletions
diff --git a/lib/util.cc b/lib/util.cc
index 29e6738..a6e08e2 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -1,25 +1,24 @@
1#include <errno.h> 1#include <errno.h>
2#include <cassert> 2#include <cassert>
3#include <cctype> 3#include <cctype>
4#include <cstring> 4#include <cstring>
5#include <vector> 5#include <vector>
6#include <string> 6#include <string>
7#include <stack> 7#include <stack>
8#include <algorithm> 8#include <algorithm>
9#include <openssl/bio.h> 9#include <openssl/bio.h>
10#include <openssl/evp.h> 10#include <openssl/evp.h>
11#include <openssl/sha.h> 11#include <openssl/sha.h>
12#include <openssl/hmac.h> 12#include <openssl/hmac.h>
13#include <curl/curl.h>
14#include <opkele/util.h> 13#include <opkele/util.h>
15#include <opkele/exception.h> 14#include <opkele/exception.h>
16#include <opkele/data.h> 15#include <opkele/data.h>
17#include <opkele/debug.h> 16#include <opkele/debug.h>
18 17
19#include <config.h> 18#include <config.h>
20#ifdef HAVE_DEMANGLE 19#ifdef HAVE_DEMANGLE
21# include <cxxabi.h> 20# include <cxxabi.h>
22#endif 21#endif
23 22
24namespace opkele { 23namespace opkele {
25 using namespace std; 24 using namespace std;
@@ -147,30 +146,58 @@ namespace opkele {
147 tm_t.tm_mon--; 146 tm_t.tm_mon--;
148 tm_t.tm_year-=1900; 147 tm_t.tm_year-=1900;
149 time_t rv = mktime(&tm_t); 148 time_t rv = mktime(&tm_t);
150 if(rv==(time_t)-1) 149 if(rv==(time_t)-1)
151 throw failed_conversion(OPKELE_CP_ "failed to mktime()"); 150 throw failed_conversion(OPKELE_CP_ "failed to mktime()");
152 return rv-timezone; 151 return rv-timezone;
153 } 152 }
154 153
155 /* 154 /*
156 * 155 *
157 */ 156 */
158 157
158 static inline bool isrfc3986unreserved(int c) {
159 if(c<'-') return false;
160 if(c<='.') return true;
161 if(c<'0') return false; if(c<='9') return true;
162 if(c<'A') return false; if(c<='Z') return true;
163 if(c<'_') return false;
164 if(c=='_') return true;
165 if(c<'a') return false; if(c<='z') return true;
166 if(c=='~') return true;
167 return false;
168 }
169
170 struct __url_encoder : public unary_function<char,void> {
171 public:
172 string& rv;
173
174 __url_encoder(string& r) : rv(r) { }
175
176 result_type operator()(argument_type c) {
177 if(isrfc3986unreserved(c))
178 rv += c;
179 else{
180 char tmp[4];
181 snprintf(tmp,sizeof(tmp),"%%%02X",
182 (c&0xff));
183 rv += tmp;
184 }
185 }
186 };
187
159 string url_encode(const string& str) { 188 string url_encode(const string& str) {
160 char * t = curl_escape(str.c_str(),str.length()); 189 string rv;
161 if(!t) 190 for_each(str.begin(),str.end(),
162 throw failed_conversion(OPKELE_CP_ "failed to curl_escape()"); 191 __url_encoder(rv));
163 string rv(t);
164 curl_free(t);
165 return rv; 192 return rv;
166 } 193 }
167 194
168 string attr_escape(const string& str) { 195 string attr_escape(const string& str) {
169 static const char *unsafechars = "<>&\n\"'"; 196 static const char *unsafechars = "<>&\n\"'";
170 string rv; 197 string rv;
171 string::size_type p=0; 198 string::size_type p=0;
172 while(true) { 199 while(true) {
173 string::size_type us = str.find_first_of(unsafechars,p); 200 string::size_type us = str.find_first_of(unsafechars,p);
174 if(us==string::npos) { 201 if(us==string::npos) {
175 if(p!=str.length()) 202 if(p!=str.length())
176 rv.append(str,p,str.length()-p); 203 rv.append(str,p,str.length()-p);