Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved do_mknod() so that it handles creating a fifo file
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
a62bc06
..
3ce5528
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-65,10
+65,6
@@
static void delete_one(char *fn, int is_dir)
rprintf(FINFO, "deleting %s\n", safe_fname(fn));
} else {
if (do_rmdir(fn) != 0) {
rprintf(FINFO, "deleting %s\n", safe_fname(fn));
} else {
if (do_rmdir(fn) != 0) {
- if (errno == ENOTDIR && keep_dirlinks) {
- delete_one(fn, 0);
- return;
- }
if (errno != ENOTEMPTY && errno != EEXIST) {
rsyserr(FERROR, errno,
"delete_one: rmdir %s failed",
if (errno != ENOTEMPTY && errno != EEXIST) {
rsyserr(FERROR, errno,
"delete_one: rmdir %s failed",
@@
-222,7
+218,8
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
read_sum_head(f_in, &sum);
if (fd_r >= 0 && size_r > 0) {
read_sum_head(f_in, &sum);
if (fd_r >= 0 && size_r > 0) {
- mapbuf = map_file(fd_r, size_r, sum.blength);
+ OFF_T map_size = MAX(sum.blength * 2, 16*1024);
+ mapbuf = map_file(fd_r, size_r, map_size, sum.blength);
if (verbose > 2) {
rprintf(FINFO, "recv mapped %s of size %.0f\n",
safe_fname(fname_r), (double)size_r);
if (verbose > 2) {
rprintf(FINFO, "recv mapped %s of size %.0f\n",
safe_fname(fname_r), (double)size_r);
@@
-437,6
+434,11
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
} else
fnamecmp = partialptr = fname;
} else
fnamecmp = partialptr = fname;
+ if (inplace && make_backups) {
+ if (!(fnamecmp = get_backup_name(fname)))
+ fnamecmp = partialptr;
+ }
+
/* open the file */
fd1 = do_open(fnamecmp, O_RDONLY, 0);
/* open the file */
fd1 = do_open(fnamecmp, O_RDONLY, 0);
@@
-488,10
+490,10
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
/* We now check to see if we are writing file "inplace" */
if (inplace) {
/* We now check to see if we are writing file "inplace" */
if (inplace) {
- fd2 = do_open(fname
cmp
, O_WRONLY|O_CREAT, 0);
+ fd2 = do_open(fname, O_WRONLY|O_CREAT, 0);
if (fd2 == -1) {
rsyserr(FERROR, errno, "open %s failed",
if (fd2 == -1) {
rsyserr(FERROR, errno, "open %s failed",
- full_fname(fname
cmp
));
+ full_fname(fname));
discard_receive_data(f_in, file->length);
if (fd1 != -1)
close(fd1);
discard_receive_data(f_in, file->length);
if (fd1 != -1)
close(fd1);