mirror/rsync
1
0 Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-10-21 05:14:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added an option to copy_file() that tells it to try to make a

Browse Source 
backup directory if the open of the dest file fails.
This commit is contained in:
Wayne Davison committed 2007-09-23 21:03:46 +00:00
1 parent c0dba635ba
commit f5b532b144
1 file changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files
util.c
+6 -6
View File
@@ -265,15 +265,14 @@ static int safe_read(int desc, char *ptr, size_t len)
*
* This is used in conjunction with the --temp-dir, --backup, and
* --copy-dest options. */
int copy_file(const char *source, const char *dest, mode_t mode)
int copy_file(const char *source, const char *dest, mode_t mode, int create_bak_dir)
{
int ifd;
int ofd;
char buf[1024 * 8];
int len; /* Number of bytes read into `buf'. */
ifd = do_open(source, O_RDONLY, 0);
if (ifd == -1) {
if ((ifd = do_open(source, O_RDONLY, 0)) < 0) {
rsyserr(FERROR, errno, "open %s", full_fname(source));
return -1;
}
@@ -283,8 +282,9 @@ int copy_file(const char *source, const char *dest, mode_t mode)
return -1;
}
ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode);
if (ofd == -1) {
if ((ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode)) < 0
&& (!create_bak_dir || errno != ENOENT || make_bak_dir(dest) < 0
|| (ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode)) < 0)) {
rsyserr(FERROR, errno, "open %s", full_fname(dest));
close(ifd);
return -1;
@@ -407,7 +407,7 @@ int robust_rename(const char *from, const char *to, const char *partialptr,
return -1;
to = partialptr;
}
if (copy_file(from, to, mode) != 0)
if (copy_file(from, to, mode, 0) != 0)
return -2;
do_unlink(from);
return 1;