external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Backport the ksh93v- rm builtin to fix 'rm -d' (#348)

Browse source 
The -d flag implemented in the rm builtin is completely broken. No
matter what you do it refuses to remove directories, even if -r is
also passed. Reproducer:

  $ mkdir /tmp/empty
  $ PATH=/opt/ast/bin rm -d /tmp/empty
  rm: /tmp/empty: directory
  $ PATH=/opt/ast/bin rm -dr /tmp/empty
  rm: /tmp/empty: directory not removed [Is a directory]

Additionally, the description of 'rm -d' in the man page contradicts
how it's specified in <https://www.austingroupbugs.net/view.php?id=802>.

The ksh93v- rm builtin fixed nearly all of these issues, so I've
backported it to 93u+m and applied one additional fix for 'rm -rd'.

src/lib/libcmd/rm.c:
- Backported the fixes from the ksh93v- rm builtin's -d flag when
  used on empty directories.
- Backported the man page update for rm(1) from ksh93v-.
- The ksh93v- rm builtin had one additional bug that caused the -r
  option to fail when combined with -d. This was fixed by
  overriding -d if -r is also passed.

src/cmd/ksh93/tests/builtins.sh:
- Add regression tests for the rm builtin's -d option.
This commit is contained in:
Johnothan King 2021-11-24 18:45:21 -08:00 • committed by Martijn Dekker
parent 2d65148fad
commit 84ded2d0c4
3 changed files with 63 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/cmd/ksh93/tests/builtins.sh
View file

@ -1311,5 +1311,46 @@ printf -v 'got[1][two][3]' 'ok\f%012d\n' $ver 2>/dev/null
"(expected $(printf %q "$exp"), got $(printf %q "$got"))"
unset got ver
# ======
# The rm builtin's -d option should remove files and empty directories without
# removing non-empty directories (unless the -r option is also passed).
# https://www.austingroupbugs.net/view.php?id=802
if builtin rm 2> /dev/null; then
echo foo > "$tmp/bar"
mkdir "$tmp/emptydir"
mkdir -p "$tmp/nonemptydir1/subfolder"
mkdir "$tmp/nonemptydir2"
echo dummyfile > "$tmp/nonemptydir2/shouldexist"
# Tests for lone -d option
got=$(rm -d "$tmp/emptydir" 2>&1)
[[ $? == 0 ]] || err_exit 'rm builtin fails to remove empty directory with -d option' \
"(got $(printf %q "$got"))"
[[ -d $tmp/emptydir ]] && err_exit 'rm builtin fails to remove empty directory with -d option'
got=$(rm -d $tmp/bar 2>&1)
[[ $? == 0 ]] || err_exit 'rm builtin fails to remove files with -d option' \
"(got $(printf %q "$got"))"
[[ -f $tmp/bar ]] && err_exit 'rm builtin fails to remove files with -d option'
rm -d "$tmp/nonemptydir1" 2> /dev/null
[[ ! -d $tmp/nonemptydir1/subfolder ]] && err_exit 'rm builtin has unwanted recursion with -d option on folder containing folder'
rm -d "$tmp/nonemptydir2" 2> /dev/null
[[ ! -f $tmp/nonemptydir2/shouldexist ]] && err_exit 'rm builtin has unwanted recursion with -d option on folder containing file'
# Recreate non-empty directories in case the above tests failed
mkdir -p "$tmp/nonemptydir1/subfolder"
mkdir -p "$tmp/nonemptydir2"
echo dummyfile > "$tmp/nonemptydir2/shouldexist"
# Tests combining -d with -r
got=$(rm -rd "$tmp/nonemptydir1" 2>&1)
[[ $? == 0 ]] || err_exit 'rm builtin fails to remove non-empty directory and subdirectory with -rd options' \
"(got $(printf %q "$got"))"
[[ -d $tmp/nonemptydir1/subfolder || -d $tmp/nonemptydir1 ]] && err_exit 'rm builtin fails to remove all folders with -rd options'
got=$(rm -rd "$tmp/nonemptydir2" 2>&1)
[[ $? == 0 ]] || err_exit 'rm builtin fails to remove non-empty directory and file with -rd options' \
"(got $(printf %q "$got"))"
[[ -f $tmp/nonemptydir2/shouldexist || -d $tmp/nonemptydir2 ]] && err_exit 'rm builtin fails to remove all folders and files with -rd options'
fi
# ======
exit $((Errors<125?Errors:125))