From 98ae8c3e383d4939e1293d3da7ad8298a80502eb Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 27 Mar 1998 03:04:34 +0000 Subject: [PATCH] Solaris uses EEXIST instead of ENOTEMPTY. --- rsync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rsync.c b/rsync.c index 82035f5d..7776ed0e 100644 --- a/rsync.c +++ b/rsync.c @@ -93,7 +93,7 @@ static int delete_file(char *fname) } if (do_rmdir(fname) == 0 || errno == ENOENT) return 0; - if (!force_delete || errno != ENOTEMPTY) { + if (!force_delete || (errno != ENOTEMPTY && errno != EEXIST)) { fprintf(FERROR,"rmdir(%s) : %s\n", fname, strerror(errno)); return -1; } @@ -618,7 +618,7 @@ static void delete_one(struct file_struct *f) } } else { if (do_rmdir(f_name(f)) != 0) { - if (errno != ENOTEMPTY) + if (errno != ENOTEMPTY && errno != EEXIST) fprintf(FERROR,"rmdir %s : %s\n",f_name(f),strerror(errno)); } else if (verbose) { fprintf(FINFO,"deleting directory %s\n",f_name(f)); -- 2.34.1