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
Added a rule for building getfsdev and for requiring it to run "test".
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
eaa2161
..
9e40fcb
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-22,7
+22,6
@@
extern int verbose;
extern int recurse;
extern int verbose;
extern int recurse;
-extern int delete_mode;
extern int delete_after;
extern int max_delete;
extern int csum_length;
extern int delete_after;
extern int max_delete;
extern int csum_length;
@@
-38,6
+37,7
@@
extern int preserve_perms;
extern int cvs_exclude;
extern int io_error;
extern char *tmpdir;
extern int cvs_exclude;
extern int io_error;
extern char *tmpdir;
+extern char *partial_dir;
extern char *compare_dest;
extern int make_backups;
extern int do_progress;
extern char *compare_dest;
extern int make_backups;
extern int do_progress;
@@
-222,7
+222,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);
@@
-247,11
+248,8
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
sum_update(data,i);
sum_update(data,i);
- if (fd != -1 && write_file(fd,data,i) != i) {
- rsyserr(FERROR, errno, "write failed on %s",
- full_fname(fname));
- exit_cleanup(RERR_FILEIO);
- }
+ if (fd != -1 && write_file(fd,data,i) != i)
+ goto report_write_error;
offset += i;
continue;
}
offset += i;
continue;
}
@@
-277,7
+275,8
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
if (inplace) {
if (offset == offset2 && fd != -1) {
if (inplace) {
if (offset == offset2 && fd != -1) {
- flush_write_file(fd);
+ if (flush_write_file(fd) < 0)
+ goto report_write_error;
offset += len;
if (do_lseek(fd, len, SEEK_CUR) != offset) {
rsyserr(FERROR, errno,
offset += len;
if (do_lseek(fd, len, SEEK_CUR) != offset) {
rsyserr(FERROR, errno,
@@
-288,11
+287,8
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
continue;
}
}
continue;
}
}
- if (fd != -1 && write_file(fd, map, len) != (int)len) {
- rsyserr(FERROR, errno, "write failed on %s",
- full_fname(fname));
- exit_cleanup(RERR_FILEIO);
- }
+ if (fd != -1 && write_file(fd, map, len) != (int)len)
+ goto report_write_error;
offset += len;
}
offset += len;
}
@@
-307,6
+303,7
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
end_progress(total_size);
if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
end_progress(total_size);
if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
+ report_write_error:
rsyserr(FERROR, errno, "write failed on %s",
full_fname(fname));
exit_cleanup(RERR_FILEIO);
rsyserr(FERROR, errno, "write failed on %s",
full_fname(fname));
exit_cleanup(RERR_FILEIO);
@@
-344,7
+341,7
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
char *fname, fbuf[MAXPATHLEN];
char template[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
char *fname, fbuf[MAXPATHLEN];
char template[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
- char *fnamecmp;
+ char *fnamecmp
, *partialptr
;
char fnamecmpbuf[MAXPATHLEN];
struct file_struct *file;
struct stats initial_stats;
char fnamecmpbuf[MAXPATHLEN];
struct file_struct *file;
struct stats initial_stats;
@@
-412,8
+409,6
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
if (verbose > 2)
rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
if (verbose > 2)
rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
- fnamecmp = fname;
-
if (read_batch) {
while (i > next_gen_i) {
next_gen_i = read_int(batch_gen_fd);
if (read_batch) {
while (i > next_gen_i) {
next_gen_i = read_int(batch_gen_fd);
@@
-431,18
+426,26
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
if (server_exclude_list.head
&& check_exclude(&server_exclude_list, fname,
S_ISDIR(file->mode)) < 0) {
if (server_exclude_list.head
&& check_exclude(&server_exclude_list, fname,
S_ISDIR(file->mode)) < 0) {
- if (verbose) {
- rprintf(FINFO,
- "skipping server-excluded update for \"%s\"\n",
- safe_fname(fname));
- }
- discard_receive_data(f_in, file->length);
- continue;
+ rprintf(FERROR, "attempt to hack rsync failed.\n");
+ exit_cleanup(RERR_PROTOCOL);
}
}
+ if (partial_dir) {
+ if ((partialptr = partial_dir_fname(fname)) != NULL)
+ fnamecmp = partialptr;
+ else
+ fnamecmp = fname;
+ } else
+ fnamecmp = partialptr = fname;
+
/* open the file */
fd1 = do_open(fnamecmp, O_RDONLY, 0);
/* open the file */
fd1 = do_open(fnamecmp, O_RDONLY, 0);
+ if (fd1 == -1 && fnamecmp != fname) {
+ fnamecmp = fname;
+ fd1 = do_open(fnamecmp, O_RDONLY, 0);
+ }
+
if (fd1 == -1 && compare_dest != NULL) {
/* try the file at compare_dest instead */
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
if (fd1 == -1 && compare_dest != NULL) {
/* try the file at compare_dest instead */
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
@@
-530,7
+533,8
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
continue;
}
continue;
}
- cleanup_set(fnametmp, fname, file, fd1, fd2);
+ if (partialptr)
+ cleanup_set(fnametmp, partialptr, file, fd1, fd2);
}
if (!am_server && verbose) /* log the transfer */
}
if (!am_server && verbose) /* log the transfer */
@@
-550,10
+554,20
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
exit_cleanup(RERR_FILEIO);
}
exit_cleanup(RERR_FILEIO);
}
- if (recv_ok ||
keep_partial ||
inplace)
+ if (recv_ok || inplace)
finish_transfer(fname, fnametmp, file, recv_ok);
finish_transfer(fname, fnametmp, file, recv_ok);
- else
+ else if (keep_partial && partialptr
+ && handle_partial_dir(partialptr, PDIR_CREATE))
+ finish_transfer(partialptr, fnametmp, file, 0);
+ else {
+ partialptr = NULL;
do_unlink(fnametmp);
do_unlink(fnametmp);
+ }
+
+ if (partialptr != fname && fnamecmp == partialptr && recv_ok) {
+ do_unlink(partialptr);
+ handle_partial_dir(partialptr, PDIR_DELETE);
+ }
cleanup_disable();
cleanup_disable();
@@
-561,9
+575,13
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
int msgtype = csum_length == SUM_LENGTH || read_batch ?
FERROR : FINFO;
if (msgtype == FERROR || verbose) {
int msgtype = csum_length == SUM_LENGTH || read_batch ?
FERROR : FINFO;
if (msgtype == FERROR || verbose) {
- char *errstr, *redostr;
- char *keptstr = keep_partial || inplace ?
- "retain" : "discard";
+ char *errstr, *redostr, *keptstr;
+ if (!(keep_partial && partialptr) && !inplace)
+ keptstr = "discarded";
+ else if (partial_dir)
+ keptstr = "put into partial-dir";
+ else
+ keptstr = "retained";
if (msgtype == FERROR) {
errstr = "ERROR";
redostr = "";
if (msgtype == FERROR) {
errstr = "ERROR";
redostr = "";
@@
-572,7
+590,7
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
redostr = " (will try again)";
}
rprintf(msgtype,
redostr = " (will try again)";
}
rprintf(msgtype,
- "%s: %s failed verification -- update %s
ed
%s.\n",
+ "%s: %s failed verification -- update %s%s.\n",
errstr, safe_fname(fname),
keptstr, redostr);
}
errstr, safe_fname(fname),
keptstr, redostr);
}