summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2006-12-03 17:51:19 (UTC)
committer Michael Krelin <hacker@klever.net>2006-12-03 17:51:19 (UTC)
commit08868f34ee339540ca392bb19e9c537d6e769464 (patch) (side-by-side diff)
tree8c8e54288f488bd7208f57ddd7f39664be6f3ece
parenta74c677c09774c02d3bc347525fb071f25d25697 (diff)
downloadkonforka-08868f34ee339540ca392bb19e9c537d6e769464.zip
konforka-08868f34ee339540ca392bb19e9c537d6e769464.tar.gz
konforka-08868f34ee339540ca392bb19e9c537d6e769464.tar.bz2
fixed missing include
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--lib/util.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/util.cc b/lib/util.cc
index 74039c6..069590b 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -1,50 +1,51 @@
#include <sys/types.h>
#include <sys/stat.h>
+#include <cassert>
#include <konforka/util.h>
namespace konforka {
/*
* XXX: this code is borrowed from sitecing as is, although it should be optimized.
*/
string normalize_path(const string& p,int o) {
const char *s = p.c_str();
if( s[0]=='.' && s[1]=='/' )
s += 2; // skip leading './'
if(o&strip_leading_slash)
for(;(*s)=='/';s++);
string rv;
string::size_type notslash = 0;
for(;*s;s++) {
if(s[0]=='/') {
if(s[1]=='/')
continue; // skip duplicate slash
if(s[1]=='.' && s[2]=='/') {
// '/./' sequence encountered
s += 2;
continue;
}
}
if(
(o&restrict_dotdot) && (
( rv.empty() && s[0]=='.' && s[1]=='.' && s[2]=='/' ) // '^../'
||
( s[0]=='/' && s[1]=='.' && s[2]=='.' && (s[3]=='/' || s[3]==0) ) // '/../' or '/..$'
)
)
throw restricted_sequence_error(CODEPOINT,"restricted updir (..) sequence encountered");
rv += *s;
if( (*s) !='/' )
notslash = rv.length();
}
if(!(o&strip_trailing_slash))
notslash++;
if(notslash<rv.length())
rv.erase(notslash); // XXX: does this operation have enough sense to be performed?
return rv;
}
string dir_name(const string& p) {
string::size_type sl = p.find_last_of('/');
if(sl==string::npos)