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
Build & run mkrounding to make the rounding.h file used by flist.c.
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
60b6c2f
..
7bf14c7
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-82,17
+82,15
@@
static int updating_basis;
* As long as it's unique, rsync will work.
*/
* As long as it's unique, rsync will work.
*/
-
static
int get_tmpname(char *fnametmp, char *fname)
+int get_tmpname(char *fnametmp, char *fname)
{
{
+ int maxname, added, length = 0;
char *f;
char *f;
- int length = 0;
- int maxname;
if (tmpdir) {
/* Note: this can't overflow, so the return value is safe */
length = strlcpy(fnametmp, tmpdir, MAXPATHLEN - 2);
fnametmp[length++] = '/';
if (tmpdir) {
/* Note: this can't overflow, so the return value is safe */
length = strlcpy(fnametmp, tmpdir, MAXPATHLEN - 2);
fnametmp[length++] = '/';
- fnametmp[length] = '\0'; /* always NULL terminated */
}
if ((f = strrchr(fname, '/')) != NULL) {
}
if ((f = strrchr(fname, '/')) != NULL) {
@@
-105,8
+103,9
@@
static int get_tmpname(char *fnametmp, char *fname)
} else
f = fname;
fnametmp[length++] = '.';
} else
f = fname;
fnametmp[length++] = '.';
- fnametmp[length] = '\0'; /* always NULL terminated */
+ /* The maxname value is bufsize, and includes space for the '\0'.
+ * (Note that NAME_MAX get -8 for the leading '.' above.) */
maxname = MIN(MAXPATHLEN - 7 - length, NAME_MAX - 8);
if (maxname < 1) {
maxname = MIN(MAXPATHLEN - 7 - length, NAME_MAX - 8);
if (maxname < 1) {
@@
-115,8
+114,10
@@
static int get_tmpname(char *fnametmp, char *fname)
return 0;
}
return 0;
}
- strlcpy(fnametmp + length, f, maxname);
- strcat(fnametmp + length, ".XXXXXX");
+ added = strlcpy(fnametmp + length, f, maxname);
+ if (added >= maxname)
+ added = maxname - 1;
+ memcpy(fnametmp + length + added, ".XXXXXX", 8);
return 1;
}
return 1;
}
@@
-163,7
+164,7
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
offset = j;
}
if (offset < sum.flength) {
offset = j;
}
if (offset < sum.flength) {
- int32 len =
sum.flength - offset
;
+ int32 len =
(int32)(sum.flength - offset)
;
if (do_progress)
show_progress(offset, total_size);
sum_update(map_ptr(mapbuf, offset, len), len);
if (do_progress)
show_progress(offset, total_size);
sum_update(map_ptr(mapbuf, offset, len), len);
@@
-278,11
+279,11
@@
static void discard_receive_data(int f_in, OFF_T length)
static void handle_delayed_updates(struct file_list *flist, char *local_name)
{
static void handle_delayed_updates(struct file_list *flist, char *local_name)
{
- char *fname, *partialptr
, numbuf[4]
;
- int
i
;
+ char *fname, *partialptr;
+ int
ndx
;
- for (
i = -1; (i = bitbag_next_bit(delayed_bits, i
)) >= 0; ) {
- struct file_struct *file = flist->files[
i
];
+ for (
ndx = -1; (ndx = bitbag_next_bit(delayed_bits, ndx
)) >= 0; ) {
+ struct file_struct *file = flist->files[
ndx
];
fname = local_name ? local_name : f_name(file, NULL);
if ((partialptr = partial_dir_fname(fname)) != NULL) {
if (make_backups && !make_backup(fname))
fname = local_name ? local_name : f_name(file, NULL);
if ((partialptr = partial_dir_fname(fname)) != NULL) {
if (make_backups && !make_backup(fname))
@@
-299,31
+300,28
@@
static void handle_delayed_updates(struct file_list *flist, char *local_name)
full_fname(fname), partialptr);
} else {
if (remove_source_files
full_fname(fname), partialptr);
} else {
if (remove_source_files
- || (preserve_hard_links
- && file->link_u.links)) {
- SIVAL(numbuf, 0, i);
- send_msg(MSG_SUCCESS,numbuf,4);
- }
+ || (preserve_hard_links && F_IS_HLINKED(file)))
+ send_msg_int(MSG_SUCCESS, ndx);
handle_partial_dir(partialptr, PDIR_DELETE);
}
}
}
}
handle_partial_dir(partialptr, PDIR_DELETE);
}
}
}
}
-static int get_next_gen_
i(int batch_gen_fd, int next_gen_i, int desired_i
)
+static int get_next_gen_
ndx(int batch_gen_fd, int next_gen_ndx, int desired_ndx
)
{
{
- while (next_gen_
i < desired_i
) {
- if (next_gen_
i
>= 0) {
+ while (next_gen_
ndx < desired_ndx
) {
+ if (next_gen_
ndx
>= 0) {
rprintf(FINFO,
"(No batched update for%s \"%s\")\n",
phase ? " resend of" : "",
rprintf(FINFO,
"(No batched update for%s \"%s\")\n",
phase ? " resend of" : "",
- f_name(the_file_list->files[next_gen_
i
], NULL));
+ f_name(the_file_list->files[next_gen_
ndx
], NULL));
}
}
- next_gen_
i
= read_int(batch_gen_fd);
- if (next_gen_
i
== -1)
- next_gen_
i
= the_file_list->count;
+ next_gen_
ndx
= read_int(batch_gen_fd);
+ if (next_gen_
ndx
== -1)
+ next_gen_
ndx
= the_file_list->count;
}
}
- return next_gen_
i
;
+ return next_gen_
ndx
;
}
}
@@
-333,14
+331,14
@@
static int get_next_gen_i(int batch_gen_fd, int next_gen_i, int desired_i)
* Receiver process runs on the same host as the generator process. */
int recv_files(int f_in, struct file_list *flist, char *local_name)
{
* Receiver process runs on the same host as the generator process. */
int recv_files(int f_in, struct file_list *flist, char *local_name)
{
- int next_gen_
i
= -1;
+ int next_gen_
ndx
= -1;
int fd1,fd2;
STRUCT_STAT st;
int iflags, xlen;
char *fname, fbuf[MAXPATHLEN];
char xname[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
int fd1,fd2;
STRUCT_STAT st;
int iflags, xlen;
char *fname, fbuf[MAXPATHLEN];
char xname[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
- char *fnamecmp, *partialptr
, numbuf[4]
;
+ char *fnamecmp, *partialptr;
char fnamecmpbuf[MAXPATHLEN];
uchar fnamecmp_type;
struct file_struct *file;
char fnamecmpbuf[MAXPATHLEN];
uchar fnamecmp_type;
struct file_struct *file;
@@
-349,15
+347,10
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
enum logcode log_code = log_before_transfer ? FLOG : FINFO;
int max_phase = protocol_version >= 29 ? 2 : 1;
int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
enum logcode log_code = log_before_transfer ? FLOG : FINFO;
int max_phase = protocol_version >= 29 ? 2 : 1;
- int
i
, recv_ok;
+ int
ndx
, recv_ok;
if (verbose > 2)
if (verbose > 2)
- rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
-
- if (flist->hlink_pool) {
- pool_destroy(flist->hlink_pool);
- flist->hlink_pool = NULL;
- }
+ rprintf(FINFO, "recv_files(%d) starting\n", flist->count);
if (delay_updates)
delayed_bits = bitbag_create(flist->count);
if (delay_updates)
delayed_bits = bitbag_create(flist->count);
@@
-367,12
+360,12
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
while (1) {
cleanup_disable();
while (1) {
cleanup_disable();
-
i
= read_int(f_in);
- if (
i == -1
) {
+
ndx
= read_int(f_in);
+ if (
ndx == NDX_DONE
) {
if (read_batch) {
if (read_batch) {
- get_next_gen_
i(batch_gen_fd, next_gen_i
,
- flist->count);
- next_gen_
i
= -1;
+ get_next_gen_
ndx(batch_gen_fd, next_gen_ndx
,
+
flist->count);
+ next_gen_
ndx
= -1;
}
if (++phase > max_phase)
break;
}
if (++phase > max_phase)
break;
@@
-391,12
+384,12
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
continue;
}
continue;
}
- iflags = read_item_attrs(f_in, -1,
i
, &fnamecmp_type,
+ iflags = read_item_attrs(f_in, -1,
ndx
, &fnamecmp_type,
xname, &xlen);
if (iflags == ITEM_IS_NEW) /* no-op packet */
continue;
xname, &xlen);
if (iflags == ITEM_IS_NEW) /* no-op packet */
continue;
- file = flist->files[
i
];
+ file = flist->files[
ndx
];
fname = local_name ? local_name : f_name(file, fbuf);
if (verbose > 2)
fname = local_name ? local_name : f_name(file, fbuf);
if (verbose > 2)
@@
-413,9
+406,9
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
exit_cleanup(RERR_PROTOCOL);
}
exit_cleanup(RERR_PROTOCOL);
}
- stats.current_file_index =
i
;
+ stats.current_file_index =
ndx
;
stats.num_transferred_files++;
stats.num_transferred_files++;
- stats.total_transferred_size +=
file->length
;
+ stats.total_transferred_size +=
F_LENGTH(file)
;
cleanup_got_literal = 0;
if (server_filter_list.head
cleanup_got_literal = 0;
if (server_filter_list.head
@@
-427,26
+420,26
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
if (!do_xfers) { /* log the transfer */
log_item(FCLIENT, file, &stats, iflags, NULL);
if (read_batch)
if (!do_xfers) { /* log the transfer */
log_item(FCLIENT, file, &stats, iflags, NULL);
if (read_batch)
- discard_receive_data(f_in,
file->length
);
+ discard_receive_data(f_in,
F_LENGTH(file)
);
continue;
}
if (write_batch < 0) {
log_item(FINFO, file, &stats, iflags, NULL);
if (!am_server)
continue;
}
if (write_batch < 0) {
log_item(FINFO, file, &stats, iflags, NULL);
if (!am_server)
- discard_receive_data(f_in,
file->length
);
+ discard_receive_data(f_in,
F_LENGTH(file)
);
continue;
}
if (read_batch) {
continue;
}
if (read_batch) {
- next_gen_
i = get_next_gen_i(batch_gen_fd, next_gen_i, i
);
- if (
i < next_gen_i
) {
+ next_gen_
ndx = get_next_gen_ndx(batch_gen_fd, next_gen_ndx, ndx
);
+ if (
ndx < next_gen_ndx
) {
rprintf(FINFO,
"(Skipping batched update for \"%s\")\n",
fname);
rprintf(FINFO,
"(Skipping batched update for \"%s\")\n",
fname);
- discard_receive_data(f_in,
file->length
);
+ discard_receive_data(f_in,
F_LENGTH(file)
);
continue;
}
continue;
}
- next_gen_
i
= -1;
+ next_gen_
ndx
= -1;
}
partialptr = partial_dir ? partial_dir_fname(fname) : fname;
}
partialptr = partial_dir ? partial_dir_fname(fname) : fname;
@@
-519,10
+512,13
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
}
}
}
}
- if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
+ if (fd1 == -1) {
+ st.st_mode = 0;
+ st.st_size = 0;
+ } else if (do_fstat(fd1,&st) != 0) {
rsyserr(FERROR, errno, "fstat %s failed",
full_fname(fnamecmp));
rsyserr(FERROR, errno, "fstat %s failed",
full_fname(fnamecmp));
- discard_receive_data(f_in,
file->length
);
+ discard_receive_data(f_in,
F_LENGTH(file)
);
close(fd1);
continue;
}
close(fd1);
continue;
}
@@
-535,7
+531,7
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
*/
rprintf(FERROR,"recv_files: %s is a directory\n",
full_fname(fnamecmp));
*/
rprintf(FERROR,"recv_files: %s is a directory\n",
full_fname(fnamecmp));
- discard_receive_data(f_in,
file->length
);
+ discard_receive_data(f_in,
F_LENGTH(file)
);
close(fd1);
continue;
}
close(fd1);
continue;
}
@@
-558,14
+554,14
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
if (fd2 == -1) {
rsyserr(FERROR, errno, "open %s failed",
full_fname(fname));
if (fd2 == -1) {
rsyserr(FERROR, errno, "open %s failed",
full_fname(fname));
- discard_receive_data(f_in,
file->length
);
+ discard_receive_data(f_in,
F_LENGTH(file)
);
if (fd1 != -1)
close(fd1);
continue;
}
} else {
if (!get_tmpname(fnametmp,fname)) {
if (fd1 != -1)
close(fd1);
continue;
}
} else {
if (!get_tmpname(fnametmp,fname)) {
- discard_receive_data(f_in,
file->length
);
+ discard_receive_data(f_in,
F_LENGTH(file)
);
if (fd1 != -1)
close(fd1);
continue;
if (fd1 != -1)
close(fd1);
continue;
@@
-591,7
+587,7
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
if (fd2 == -1) {
rsyserr(FERROR, errno, "mkstemp %s failed",
full_fname(fnametmp));
if (fd2 == -1) {
rsyserr(FERROR, errno, "mkstemp %s failed",
full_fname(fnametmp));
- discard_receive_data(f_in,
file->length
);
+ discard_receive_data(f_in,
F_LENGTH(file)
);
if (fd1 != -1)
close(fd1);
continue;
if (fd1 != -1)
close(fd1);
continue;
@@
-608,7
+604,7
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
- fname, fd2,
file->length
);
+ fname, fd2,
F_LENGTH(file)
);
log_item(log_code, file, &initial_stats, iflags, NULL);
log_item(log_code, file, &initial_stats, iflags, NULL);
@@
-639,7
+635,7
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
finish_transfer(partialptr, fnametmp, NULL,
file, recv_ok, !partial_dir);
if (delay_updates && recv_ok) {
finish_transfer(partialptr, fnametmp, NULL,
file, recv_ok, !partial_dir);
if (delay_updates && recv_ok) {
- bitbag_set_bit(delayed_bits,
i
);
+ bitbag_set_bit(delayed_bits,
ndx
);
recv_ok = -1;
}
} else {
recv_ok = -1;
}
} else {
@@
-651,12
+647,10
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
if (recv_ok > 0) {
if (remove_source_files
if (recv_ok > 0) {
if (remove_source_files
- || (preserve_hard_links && file->link_u.links)) {
- SIVAL(numbuf, 0, i);
- send_msg(MSG_SUCCESS, numbuf, 4);
- }
+ || (preserve_hard_links && F_IS_HLINKED(file)))
+ send_msg_int(MSG_SUCCESS, ndx);
} else if (!recv_ok) {
} else if (!recv_ok) {
-
int
msgtype = phase || read_batch ? FERROR : FINFO;
+
enum logcode
msgtype = phase || read_batch ? FERROR : FINFO;
if (msgtype == FERROR || verbose) {
char *errstr, *redostr, *keptstr;
if (!(keep_partial && partialptr) && !inplace)
if (msgtype == FERROR || verbose) {
char *errstr, *redostr, *keptstr;
if (!(keep_partial && partialptr) && !inplace)
@@
-676,10
+670,8
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
"%s: %s failed verification -- update %s%s.\n",
errstr, fname, keptstr, redostr);
}
"%s: %s failed verification -- update %s%s.\n",
errstr, fname, keptstr, redostr);
}
- if (!phase) {
- SIVAL(numbuf, 0, i);
- send_msg(MSG_REDO, numbuf, 4);
- }
+ if (!phase)
+ send_msg_int(MSG_REDO, ndx);
}
}
make_backups = save_make_backups;
}
}
make_backups = save_make_backups;