--- aaa_base~   Mon Jan  3 18:16:55 2000
+++ aaa_base    Fri Apr 21 08:42:19 2000 
@@ -158,20 +158,10 @@
     done

     for TMP_DIR in $TMP_DIRS_TO_CLEAR ; do
-        for DEL_FILE in `find $TMP_DIR/. $OMIT \( -type f -o -type l \) \
-                         -atime +$MAX_DAYS_IN_TMP | sort -r` ; do
-            rm -f $DEL_FILE
-            DEL_DIR=`dirname $DEL_FILE` 
-            if [ "$DEL_DIR" != "$TMP_DIR/." ] ; then
-                rmdir $DEL_DIR 2> /dev/null
-            fi
-        done
-    done 
-    for DEL_DIR in `find $TMP_DIR/. $OMIT \( -type d \) \
-                    -ctime +$MAX_DAYS_IN_TMP | sort -r` ; do
-        if [ "$DEL_DIR" != "$TMP_DIR/." ] ; then
-            rmdir $DEL_DIR 2> /dev/null
-        fi
+               find $TMP_DIR/. $OMIT ! -type d \
+                       -atime +$MAX_DAYS_IN_TMP -exec rm -f '{}' ';'
+               find $TMP_DIR/. $OMIT -depth -type d -empty -mindepth 1 \
+                       -mtime +$MAX_DAYS_IN_TMP -exec rmdir '{}' ';'
     done
 fi