X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e30f065766d103b47aaccbe777308e0d2381fd6e..65d0a49f5c0d7f389ca1b2273f0a8ba306630a06:/rsync.c diff --git a/rsync.c b/rsync.c index a2b432a2..63132672 100644 --- a/rsync.c +++ b/rsync.c @@ -43,7 +43,7 @@ void free_sums(struct sum_struct *s) /* - * delete a file or directory. If force_delet is set then delete + * delete a file or directory. If force_delete is set then delete * recursively */ int delete_file(char *fname) @@ -56,19 +56,17 @@ int delete_file(char *fname) int ret; extern int recurse; - if (robust_unlink(fname) == 0 || errno == ENOENT) return 0; - #if SUPPORT_LINKS ret = do_lstat(fname, &st); #else ret = do_stat(fname, &st); #endif if (ret) { - rprintf(FERROR,"stat(%s) : %s\n", fname, strerror(errno)); return -1; } if (!S_ISDIR(st.st_mode)) { + if (robust_unlink(fname) == 0 || errno == ENOENT) return 0; rprintf(FERROR,"unlink(%s) : %s\n", fname, strerror(errno)); return -1; } @@ -259,6 +257,3 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file) set_perms(fname,file,NULL,0); } } - - -