#include "support/docstring.h"
#include "support/FileName.h"
#include "support/lstrings.h"
+#include "support/lassert.h"
#include <limits.h>
#include <stdlib.h>
namespace support {
namespace os {
-void init(int, char *[])
+namespace {
+
+int argc_ = 0;
+char ** argv_ = 0;
+
+} // namespace anon
+
+void init(int argc, char * argv[])
+{
+ argc_ = argc;
+ argv_ = argv;
+}
+
+
+string utf8_argv(int i)
+{
+ LASSERT(i < argc_, /**/);
+ return to_utf8(from_local8bit(argv_[i]));
+}
+
+
+void remove_internal_args(int, int)
{}
--i; // here was the last match
while (i && p1[i] != '/')
--i;
- } else
- --i;
-
+ }
return i;
}
docstring const p2 = from_utf8(pre);
docstring::size_type const p1_len = p1.length();
docstring::size_type const p2_len = p2.length();
- docstring::size_type const common_len = common_path(p1, p2) + 1;
+ docstring::size_type common_len = common_path(p1, p2);
- if (common_len == 1) {
- if (p2_len != 1 || p1_len == 0 || p1[0] != p2[0]
- || (p1_len != 1 && p1[1] != '/'))
- return false;
- } else if (common_len != p2_len)
+ if (p2[p2_len - 1] == '/' && p1_len != p2_len)
+ ++common_len;
+
+ if (common_len != p2_len)
return false;
- if (how == CASE_ADJUSTED && !prefixIs(path, pre))
- path = to_utf8(p2 + p1.substr(common_len, p1_len - common_len));
+ if (how == CASE_ADJUSTED && !prefixIs(path, pre)) {
+ if (p1_len < common_len)
+ path = to_utf8(p2.substr(0, p1_len));
+ else
+ path = to_utf8(p2 + p1.substr(common_len,
+ p1_len - common_len));
+ }
return true;
#else
}
+string safe_internal_path(string const & p, file_access)
+{
+ return p;
+}
+
+
string external_path_list(string const & p)
{
return p;