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
Use the new f_name_to() calling syntax.
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
bc297ca
..
e2fd13b
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-94,7
+94,7
@@
void delete_files(struct file_list *flist)
if (!S_ISDIR(flist->files[j]->mode) ||
!(flist->files[j]->flags & FLAG_DELETE)) continue;
if (!S_ISDIR(flist->files[j]->mode) ||
!(flist->files[j]->flags & FLAG_DELETE)) continue;
- name = f_name_to(flist->files[j], fbuf
, sizeof fbuf
);
+ name = f_name_to(flist->files[j], fbuf);
if (!(local_file_list = send_file_list(-1,1,&name)))
continue;
if (!(local_file_list = send_file_list(-1,1,&name)))
continue;
@@
-151,8
+151,7
@@
static int get_tmpname(char *fnametmp, char *fname)
int maxname;
if (tmpdir) {
int maxname;
if (tmpdir) {
- strlcpy(fnametmp, tmpdir, MAXPATHLEN - 2);
- length = strlen(fnametmp);
+ length = strlcpy(fnametmp, tmpdir, MAXPATHLEN - 2);
fnametmp[length++] = '/';
fnametmp[length] = '\0'; /* always NULL terminated */
}
fnametmp[length++] = '/';
fnametmp[length] = '\0'; /* always NULL terminated */
}
@@
-280,7
+279,7
@@
static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
* main routine for receiver process.
*
* Receiver process runs on the same host as the generator process. */
* main routine for receiver process.
*
* 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 f_gen
)
+int recv_files(int f_in,struct file_list *flist,char *local_name)
{
int fd1,fd2;
STRUCT_STAT st;
{
int fd1,fd2;
STRUCT_STAT st;
@@
-309,12
+308,12
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
i = read_int(f_in);
if (i == -1) {
i = read_int(f_in);
if (i == -1) {
- if (phase
==
0) {
+ if (phase
==
0) {
phase++;
csum_length = SUM_LENGTH;
if (verbose > 2)
rprintf(FINFO,"recv_files phase=%d\n",phase);
phase++;
csum_length = SUM_LENGTH;
if (verbose > 2)
rprintf(FINFO,"recv_files phase=%d\n",phase);
-
write_int(f_gen,-1
);
+
send_msg(MSG_DONE, "", 0
);
continue;
}
break;
continue;
}
break;
@@
-328,6
+327,7
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
file = flist->files[i];
file = flist->files[i];
+ stats.current_file_index = i;
stats.num_transferred_files++;
stats.total_transferred_size += file->length;
cleanup_got_literal = 0;
stats.num_transferred_files++;
stats.total_transferred_size += file->length;
cleanup_got_literal = 0;
@@
-335,7
+335,7
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
if (local_name)
fname = local_name;
else
if (local_name)
fname = local_name;
else
- fname = f_name_to(file, fbuf
, sizeof fbuf
);
+ fname = f_name_to(file, fbuf);
if (dry_run) {
if (!am_server && verbose) { /* log transfer */
if (dry_run) {
if (!am_server && verbose) { /* log transfer */
@@
-465,9
+465,11
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
full_fname(fname));
} else {
rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
full_fname(fname));
} else {
+ char buf[4];
if (verbose > 1)
rprintf(FINFO,"redoing %s(%d)\n",fname,i);
if (verbose > 1)
rprintf(FINFO,"redoing %s(%d)\n",fname,i);
- write_int(f_gen,i);
+ SIVAL(buf, 0, i);
+ send_msg(MSG_REDO, buf, 4);
}
}
}
}
}
}
@@
-484,8
+486,8
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
for (i = 0; i < flist->count; i++) {
file = flist->files[i];
if (!file->basename || !S_ISDIR(file->mode)) continue;
for (i = 0; i < flist->count; i++) {
file = flist->files[i];
if (!file->basename || !S_ISDIR(file->mode)) continue;
- recv_generator(local_name
? local_name
-
: f_name_to(file,fbuf,sizeof fbuf),
file, i, -1);
+ recv_generator(local_name
? local_name : f_name_to(file, fbuf),
+
file, i, -1);
}
if (verbose > 2)
}
if (verbose > 2)