basename: fix /, add autoconf basename, dirname tests.

This commit is contained in:
Jan Nieuwenhuizen 2018-12-09 04:13:27 +01:00
parent f8a4f8aeae
commit 8757ab67fb
10 changed files with 30 additions and 2 deletions

View File

@ -129,6 +129,11 @@ tests='
100-test-file
100-bracket-file
100-basename-root
100-dirname-root
100-basename-autoconf
100-dirname-autoconf
100-sed
100-sed-once
100-sed-global

View File

@ -68,8 +68,9 @@ Options:
(if (and (> (string-length file) 1)
(string-suffix? "/" file)) (string-drop-right file 1)
file)))
(if suffix (display ((@ (guile) basename) file suffix))
(display ((@ (guile) basename) file))))
(cond ((string=? file "/") (display "/"))
(suffix (display ((@ (guile) basename) file suffix)))
(else (display ((@ (guile) basename) file)))))
(if zero? (display #\nul) (newline)))
files))))))

View File

@ -0,0 +1,6 @@
if (\basename -- /) >/dev/null 2>&1 && \test "X`\basename -- / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
fi
echo as_basename:$as_basename

View File

@ -0,0 +1 @@
as_basename:basename

View File

@ -0,0 +1,2 @@
\basename /root
\basename /

View File

@ -0,0 +1,2 @@
root
/

View File

@ -0,0 +1,6 @@
if (as_dir=`\dirname -- /` && \test "X$as_dir" = X/) >/dev/null 2>&1; then
as_dirname=dirname
else
as_dirname=false
fi
echo as_dirname:$as_dirname

View File

@ -0,0 +1 @@
as_dirname:dirname

2
test/100-dirname-root.sh Normal file
View File

@ -0,0 +1,2 @@
\dirname /root
\dirname /

View File

@ -0,0 +1,2 @@
/
/