diff options
author | Tim J. Robbins <tjr@FreeBSD.org> | 2002-12-09 02:22:50 +0000 |
---|---|---|
committer | Tim J. Robbins <tjr@FreeBSD.org> | 2002-12-09 02:22:50 +0000 |
commit | 04990158cf97e5592b5bdcd7683f01f19d215c94 (patch) | |
tree | 83f0f929b8c1475b1c4ac9db46bfac7cb5e69adc | |
parent | c4d8d4b8b7122ac16cfc0f882774a99f3537a0a9 (diff) | |
download | pw-darwin-04990158cf97e5592b5bdcd7683f01f19d215c94.tar.gz pw-darwin-04990158cf97e5592b5bdcd7683f01f19d215c94.tar.zst pw-darwin-04990158cf97e5592b5bdcd7683f01f19d215c94.zip |
Correctly handle files with IFS characters (spaces) in their names when
cleaning up temporary files.
Submitted by: Mike Makonnen <mtm@identd.net>
Approved by: re
-rw-r--r-- | adduser/rmuser.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/adduser/rmuser.sh b/adduser/rmuser.sh index afc978c..67c9a83 100644 --- a/adduser/rmuser.sh +++ b/adduser/rmuser.sh @@ -33,7 +33,7 @@ ATJOBDIR="/var/at/jobs" CRONJOBDIR="/var/cron/tabs" MAILSPOOL="/var/mail" SIGKILL="-KILL" -TEMPDIRS="/tmp /var/tmp /var/tmp/vi.recover" +TEMPDIRS="/tmp /var/tmp" THISCMD=`/usr/bin/basename $0` # err msg @@ -57,12 +57,8 @@ rm_files() { continue fi echo -n "Removing files owned by ($login) in $_dir:" - filecount=0 - _ownedfiles=`find 2>/dev/null $_dir -maxdepth 1 -user $login -print` - for _file in $_ownedfiles ; do - rm -fd $_file - filecount=`expr $filecount + 1` - done + filecount=`find 2>/dev/null "$_dir" -user "$login" -delete -print | \ + wc -l | sed 's/ *//'` echo " $filecount removed." done } |