From 27124aab29d54ba9f228dee18a48e903e222812a Mon Sep 17 00:00:00 2001 From: dzwdz Date: Fri, 5 Aug 2022 14:01:42 +0200 Subject: move path_simplify to shared code, move its tests to userland --- src/kernel/vfs/path.c | 58 --------------------------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 src/kernel/vfs/path.c (limited to 'src/kernel/vfs/path.c') diff --git a/src/kernel/vfs/path.c b/src/kernel/vfs/path.c deleted file mode 100644 index e8ce49c..0000000 --- a/src/kernel/vfs/path.c +++ /dev/null @@ -1,58 +0,0 @@ -#include -#include -#include - -int path_simplify(const char *in, char *out, size_t len) { - if (len == 0) return -1; // empty paths are invalid - if (in[0] != '/') return -1; // so are relative paths - - int seg_len; // the length of the current path segment - int out_pos = 0; - bool directory = 0; - - for (size_t i = 0; i < len; i += seg_len + 1) { - assert(in[i] == '/'); - - seg_len = 0; - directory = false; - for (size_t j = i + 1; j < len; j++) { - if (in[j] == '/') { - directory = true; - break; - } - seg_len++; - } - - /* example iteration, illustrated with terrible ASCII art - * - * |i=5 |next i = i + seg_len + 1 = 10 - * v v - * /some/path/asdf - * |--| - * seg_len = 4 - * (segment starts at i+1) */ - - if (seg_len == 0 || (seg_len == 1 && in[i + 1] == '.')) { - /* // or /./ */ - directory = true; - } else if (seg_len == 2 && in[i + 1] == '.' && in[i + 2] == '.') { - /* /../ */ - directory = true; - - /* try to backtrack to the last slash */ - while (--out_pos >= 0 && out[out_pos] != '/'); - if (out_pos < 0) return -1; - } else { - /* a normal segment, e.g. /asdf/ */ - out[out_pos] = '/'; - memcpy(&out[out_pos + 1], &in[i + 1], seg_len); - out_pos += seg_len + 1; - } - - } - - /* paths to directories should have a trailing slash */ - if (directory) out[out_pos++] = '/'; - - return out_pos; -} -- cgit v1.2.3