basename: fix /, add autoconf basename, dirname tests.
This commit is contained in:
parent
f8a4f8aeae
commit
8757ab67fb
5
check.sh
5
check.sh
|
@ -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
|
||||
|
|
|
@ -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))))))
|
||||
|
||||
|
|
|
@ -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
|
|
@ -0,0 +1 @@
|
|||
as_basename:basename
|
|
@ -0,0 +1,2 @@
|
|||
\basename /root
|
||||
\basename /
|
|
@ -0,0 +1,2 @@
|
|||
root
|
||||
/
|
|
@ -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
|
|
@ -0,0 +1 @@
|
|||
as_dirname:dirname
|
|
@ -0,0 +1,2 @@
|
|||
\dirname /root
|
||||
\dirname /
|
|
@ -0,0 +1,2 @@
|
|||
/
|
||||
/
|
Loading…
Reference in New Issue