summaryrefslogtreecommitdiff
path: root/rsync.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-05-28 05:05:26 +0000
committerAndrew Tridgell <tridge@samba.org>1998-05-28 05:05:26 +0000
commit05848a2cc797b777473023b0dff6bba62668dc78 (patch)
tree48416045b6c1065c25cb2c75dda8f914a80b8883 /rsync.c
parent528bfcd79a0ebcf9a2a0071981525213f25b1fc6 (diff)
downloadrsync-05848a2cc797b777473023b0dff6bba62668dc78.tar.gz
rsync-05848a2cc797b777473023b0dff6bba62668dc78.tar.bz2
rsync-05848a2cc797b777473023b0dff6bba62668dc78.zip
don't do recursive deletion if the recurse option is not selected.
Diffstat (limited to 'rsync.c')
-rw-r--r--rsync.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/rsync.c b/rsync.c
index 555c009a..f41029be 100644
--- a/rsync.c
+++ b/rsync.c
@@ -74,6 +74,7 @@ static int delete_file(char *fname)
extern int force_delete;
STRUCT_STAT st;
int ret;
+ extern int recurse;
if (do_unlink(fname) == 0 || errno == ENOENT) return 0;
@@ -93,7 +94,8 @@ static int delete_file(char *fname)
}
if (do_rmdir(fname) == 0 || errno == ENOENT) return 0;
- if (!force_delete || (errno != ENOTEMPTY && errno != EEXIST)) {
+ if (!force_delete || !recurse ||
+ (errno != ENOTEMPTY && errno != EEXIST)) {
rprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno));
return -1;
}