summaryrefslogtreecommitdiffabout
path: root/lib
authorMichael Krelin <hacker@klever.net>2008-06-25 21:37:52 (UTC)
committer Michael Krelin <hacker@klever.net>2008-06-25 21:37:52 (UTC)
commit026a467b0e1db2d90ad1b4d0be6511c777da39e7 (patch) (unidiff)
tree0c853e8df4b5c6cfa8c31e6092c05692c8aeddbb /lib
parent903f7b8108cdb9d1340267f456f23815ead5e807 (diff)
downloadlibopkele-026a467b0e1db2d90ad1b4d0be6511c777da39e7.zip
libopkele-026a467b0e1db2d90ad1b4d0be6511c777da39e7.tar.gz
libopkele-026a467b0e1db2d90ad1b4d0be6511c777da39e7.tar.bz2
gave up the most stupid bug contest award
Thanks to compiler for spotting it. Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (limited to 'lib') (more/less context) (ignore whitespace changes)
-rw-r--r--lib/util.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/util.cc b/lib/util.cc
index 3e7f3aa..b702291 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -160,100 +160,100 @@ namespace opkele {
160 if(c<='.') return true; 160 if(c<='.') return true;
161 if(c<'0') return false; if(c<='9') return true; 161 if(c<'0') return false; if(c<='9') return true;
162 if(c<'A') return false; if(c<='Z') return true; 162 if(c<'A') return false; if(c<='Z') return true;
163 if(c<'_') return false; 163 if(c<'_') return false;
164 if(c=='_') return true; 164 if(c=='_') return true;
165 if(c<'a') return false; if(c<='z') return true; 165 if(c<'a') return false; if(c<='z') return true;
166 if(c=='~') return true; 166 if(c=='~') return true;
167 return false; 167 return false;
168 } 168 }
169 169
170 struct __url_encoder : public unary_function<char,void> { 170 struct __url_encoder : public unary_function<char,void> {
171 public: 171 public:
172 string& rv; 172 string& rv;
173 173
174 __url_encoder(string& r) : rv(r) { } 174 __url_encoder(string& r) : rv(r) { }
175 175
176 result_type operator()(argument_type c) { 176 result_type operator()(argument_type c) {
177 if(isrfc3986unreserved(c)) 177 if(isrfc3986unreserved(c))
178 rv += c; 178 rv += c;
179 else{ 179 else{
180 char tmp[4]; 180 char tmp[4];
181 snprintf(tmp,sizeof(tmp),"%%%02X", 181 snprintf(tmp,sizeof(tmp),"%%%02X",
182 (c&0xff)); 182 (c&0xff));
183 rv += tmp; 183 rv += tmp;
184 } 184 }
185 } 185 }
186 }; 186 };
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) { 195 string url_decode(const string& str) {
196 string rv; 196 string rv;
197 back_insert_iterator<string> ii(rv); 197 back_insert_iterator<string> ii(rv);
198 for(string::const_iterator i=str.begin(),ie=str.end(); 198 for(string::const_iterator i=str.begin(),ie=str.end();
199 i!=ie;++i) { 199 i!=ie;++i) {
200 switch(*i) { 200 switch(*i) {
201 case '+': 201 case '+':
202 *(ii++) = ' '; break; 202 *(ii++) = ' '; break;
203 case '%': 203 case '%':
204 ++i; 204 ++i;
205 static char tmp[3] = {0,0,0}; 205 static char tmp[3] = {0,0,0};
206 if(i==ie) 206 if(i==ie)
207 throw failed_conversion(OPKELE_CP_ "trailing percent in the url-encoded string"); 207 throw failed_conversion(OPKELE_CP_ "trailing percent in the url-encoded string");
208 tmp[0] == *(i++); 208 tmp[0] = *(i++);
209 if(i==ie) 209 if(i==ie)
210 throw failed_conversion(OPKELE_CP_ "not enough hexadecimals after the percent sign in url-encoded string"); 210 throw failed_conversion(OPKELE_CP_ "not enough hexadecimals after the percent sign in url-encoded string");
211 tmp[1] == *i; 211 tmp[1] = *i;
212 if(!(isxdigit(tmp[0]) && isxdigit(tmp[1]))) 212 if(!(isxdigit(tmp[0]) && isxdigit(tmp[1])))
213 throw failed_conversion(OPKELE_CP_ "non-hex follows percent in url-encoded string"); 213 throw failed_conversion(OPKELE_CP_ "non-hex follows percent in url-encoded string");
214 *(ii++) = strtol(tmp,0,16); 214 *(ii++) = strtol(tmp,0,16);
215 break; 215 break;
216 default: 216 default:
217 *(ii++) = *i; break; 217 *(ii++) = *i; break;
218 } 218 }
219 } 219 }
220 return rv; 220 return rv;
221 } 221 }
222 222
223 string attr_escape(const string& str) { 223 string attr_escape(const string& str) {
224 static const char *unsafechars = "<>&\n\"'"; 224 static const char *unsafechars = "<>&\n\"'";
225 string rv; 225 string rv;
226 string::size_type p=0; 226 string::size_type p=0;
227 while(true) { 227 while(true) {
228 string::size_type us = str.find_first_of(unsafechars,p); 228 string::size_type us = str.find_first_of(unsafechars,p);
229 if(us==string::npos) { 229 if(us==string::npos) {
230 if(p!=str.length()) 230 if(p!=str.length())
231 rv.append(str,p,str.length()-p); 231 rv.append(str,p,str.length()-p);
232 return rv; 232 return rv;
233 } 233 }
234 rv.append(str,p,us-p); 234 rv.append(str,p,us-p);
235 rv += "&#"; 235 rv += "&#";
236 rv += long_to_string((long)str[us]); 236 rv += long_to_string((long)str[us]);
237 rv += ';'; 237 rv += ';';
238 p = us+1; 238 p = us+1;
239 } 239 }
240 } 240 }
241 241
242 string long_to_string(long l) { 242 string long_to_string(long l) {
243 char rv[32]; 243 char rv[32];
244 int r=snprintf(rv,sizeof(rv),"%ld",l); 244 int r=snprintf(rv,sizeof(rv),"%ld",l);
245 if(r<0 || r>=(int)sizeof(rv)) 245 if(r<0 || r>=(int)sizeof(rv))
246 throw failed_conversion(OPKELE_CP_ "failed to snprintf()"); 246 throw failed_conversion(OPKELE_CP_ "failed to snprintf()");
247 return rv; 247 return rv;
248 } 248 }
249 249
250 long string_to_long(const string& s) { 250 long string_to_long(const string& s) {
251 char *endptr = 0; 251 char *endptr = 0;
252 long rv = strtol(s.c_str(),&endptr,10); 252 long rv = strtol(s.c_str(),&endptr,10);
253 if((!endptr) || endptr==s.c_str()) 253 if((!endptr) || endptr==s.c_str())
254 throw failed_conversion(OPKELE_CP_ "failed to strtol()"); 254 throw failed_conversion(OPKELE_CP_ "failed to strtol()");
255 return rv; 255 return rv;
256 } 256 }
257 257
258 /* 258 /*
259 * Normalize URL according to the rules, described in rfc 3986, section 6 259 * Normalize URL according to the rules, described in rfc 3986, section 6