--- mirror.orig Tue May 13 14:14:13 2003 +++ mirror Tue May 13 14:33:57 2003 @@ -3175,9 +3175,12 @@ &msg( $log, "rmdir $cwd/$del failed: $!\n" ); } else { - &msg( $log, "delete DIR $del\n" ); - &ftp'delete( "$del" ) || + &msg( $log, "rmdir DIR $del\n" ); + &ftp'deldir( "$del" ) || &msg( $log, "ftp delete DIR $del failed\n" ); + # &msg( $log, "delete DIR $del\n" ); + # &ftp'delete( "$del" ) || + # &msg( $log, "ftp delete DIR $del failed\n" ); } } else { --- ftp.pl.orig Tue May 13 14:32:02 2003 +++ ftp.pl Tue May 13 14:40:35 2003 @@ -923,7 +923,27 @@ sub deldir { - local( $fname ) = @_; + local( $rem_dir ) = @_; + local( $ret ); + + if( ! $service_open ){ + return 0; + } + + if( $mapunixout ){ + $rem_dir = eval "&$mapunixout( \$rem_dir, 'd' )"; + } + + &send( "RMD $rem_dir" ); + + $ret = &expect( $timeout, + 2, 1 ); # Deleted $rem_dir + if( $ret == 99 ){ + &service_closed(); + $ret = 0; + } + + return $ret == 1; # not yet implemented # RMD