diff options
author | Wayne Davison <wayned@samba.org> | 2005-02-22 01:57:58 +0000 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2005-02-22 01:57:58 +0000 |
commit | ba679d5194af77accc0793ccb0425a5839f628c9 (patch) | |
tree | 4ed7a8c0cb9be967bd880c37a90cb0db0a8f9b9c /backup.c | |
parent | e1ad7fe63d98b4aace63a0f1ab502db8e88063f6 (diff) | |
download | android_external_rsync-ba679d5194af77accc0793ccb0425a5839f628c9.tar.gz android_external_rsync-ba679d5194af77accc0793ccb0425a5839f628c9.tar.bz2 android_external_rsync-ba679d5194af77accc0793ccb0425a5839f628c9.zip |
In make_simple_backup(), if the rename() failed because we tried
to rename a directory over a file or visa versa, try to handle it.
Diffstat (limited to 'backup.c')
-rw-r--r-- | backup.c | 32 |
1 files changed, 23 insertions, 9 deletions
@@ -55,23 +55,37 @@ char *get_backup_name(char *fname) /* simple backup creates a backup with a suffix in the same directory */ static int make_simple_backup(char *fname) { + int rename_errno; char *fnamebak = get_backup_name(fname); if (!fnamebak) return 0; - if (do_rename(fname, fnamebak) != 0) { - /* cygwin (at least version b19) reports EINVAL */ - if (errno != ENOENT && errno != EINVAL) { - rsyserr(FERROR, errno, - "rename %s to backup %s", - safe_fname(fname), safe_fname(fnamebak)); - return 0; + while (1) { + if (do_rename(fname, fnamebak) == 0) { + if (verbose > 1) { + rprintf(FINFO, "backed up %s to %s\n", + safe_fname(fname), + safe_fname(fnamebak)); + } + break; } - } else if (verbose > 1) { - rprintf(FINFO, "backed up %s to %s\n", + /* cygwin (at least version b19) reports EINVAL */ + if (errno == ENOENT || errno == EINVAL) + break; + + rename_errno = errno; + if (errno == EISDIR && do_rmdir(fnamebak) == 0) + continue; + if (errno == ENOTDIR && do_unlink(fnamebak) == 0) + continue; + + rsyserr(FERROR, rename_errno, "rename %s to backup %s", safe_fname(fname), safe_fname(fnamebak)); + errno = rename_errno; + return 0; } + return 1; } |