diff options
| -rw-r--r-- | eval.c | 9 | ||||
| -rwxr-xr-x | tests.sh | 5 | ||||
| -rw-r--r-- | tests/test_0044.out | 2 | ||||
| -rw-r--r-- | tests/test_0100.out | 2 |
4 files changed, 8 insertions, 10 deletions
@@ -261,8 +261,6 @@ bool eval_delete(const struct expr *expr, struct eval_state *state) { return true; } -static const char *exec_slash = "/"; - static const char *exec_format_path(const struct expr *expr, const struct BFTW *ftwbuf) { if (!(expr->exec_flags & EXEC_CHDIR)) { return ftwbuf->path; @@ -271,8 +269,9 @@ static const char *exec_format_path(const struct expr *expr, const struct BFTW * const char *name = ftwbuf->path + ftwbuf->nameoff; if (name[0] == '/') { - // Must be the root path ("/", "//", etc.), which we canonicalize - return exec_slash; + // Must be a root path ("/", "//", etc.) + assert(ftwbuf->nameoff == 0); + return name; } // For compatibility with GNU find, use './name' instead of just 'name' @@ -299,7 +298,7 @@ err: } static void exec_free_path(const char *path, const struct BFTW *ftwbuf) { - if (path != ftwbuf->path && path != exec_slash) { + if (path != ftwbuf->path) { dstrfree((char *)path); } } @@ -289,7 +289,7 @@ function test_0043() { } function test_0044() { - bfs_diff // -maxdepth 0 -name / 2>/dev/null + bfs_diff /// -maxdepth 0 -name / 2>/dev/null } function test_0045() { @@ -536,8 +536,7 @@ function test_0099() { } function test_0100() { - # // is canonicalized to / - bfs_diff // -maxdepth 0 -execdir echo '{}' ';' + bfs_diff /// -maxdepth 0 -execdir echo '{}' ';' } for i in {1..100}; do diff --git a/tests/test_0044.out b/tests/test_0044.out index 8337712..187b81f 100644 --- a/tests/test_0044.out +++ b/tests/test_0044.out @@ -1 +1 @@ -// +/// diff --git a/tests/test_0100.out b/tests/test_0100.out index b498fd4..187b81f 100644 --- a/tests/test_0100.out +++ b/tests/test_0100.out @@ -1 +1 @@ -/ +/// |