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
Moved some code out of the main loop in send_files() into a new
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
b71d599
..
1dfa96f
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-306,17
+306,6
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
static void read_gen_name(int fd, char *dirname, char *buf)
{
int dlen;
static void read_gen_name(int fd, char *dirname, char *buf)
{
int dlen;
- int len = read_byte(fd);
-
- if (len & 0x80) {
-#if MAXPATHLEN > 32767
- uchar lenbuf[2];
- read_buf(fd, (char *)lenbuf, 2);
- len = (len & ~0x80) * 0x10000 + lenbuf[0] * 0x100 + lenbuf[1];
-#else
- len = (len & ~0x80) * 0x100 + read_byte(fd);
-#endif
- }
if (dirname) {
dlen = strlcpy(buf, dirname, MAXPATHLEN);
if (dirname) {
dlen = strlcpy(buf, dirname, MAXPATHLEN);
@@
-324,12
+313,7
@@
static void read_gen_name(int fd, char *dirname, char *buf)
} else
dlen = 0;
} else
dlen = 0;
- if (dlen + len >= MAXPATHLEN) {
- rprintf(FERROR, "bogus data on generator name pipe\n");
- exit_cleanup(RERR_PROTOCOL);
- }
-
- read_sbuf(fd, buf + dlen, len);
+ read_vstring(fd, buf + dlen, MAXPATHLEN - dlen);
}
}
@@
-424,11
+408,11
@@
int recv_files(int f_in, struct file_list *flist, char *local_name,
int see_item = itemizing && (iflags || verbose > 1);
if (am_server) {
if (am_daemon && !dry_run && see_item)
int see_item = itemizing && (iflags || verbose > 1);
if (am_server) {
if (am_daemon && !dry_run && see_item)
- log_
recv(file, &stats, iflags
);
+ log_
item(file, &stats, iflags, NULL
);
} else if (see_item || iflags & ITEM_UPDATING
|| (S_ISDIR(file->mode)
&& iflags & ITEM_REPORT_TIME))
} else if (see_item || iflags & ITEM_UPDATING
|| (S_ISDIR(file->mode)
&& iflags & ITEM_REPORT_TIME))
- log_
recv(file, &stats, iflags
);
+ log_
item(file, &stats, iflags, NULL
);
continue;
}
} else
continue;
}
} else
@@
-453,7
+437,7
@@
int recv_files(int f_in, struct file_list *flist, char *local_name,
if (dry_run) { /* log the transfer */
if (!am_server && log_format)
if (dry_run) { /* log the transfer */
if (!am_server && log_format)
- log_
recv(file, &stats, iflags
);
+ log_
item(file, &stats, iflags, NULL
);
continue;
}
continue;
}
@@
-597,7
+581,7
@@
int recv_files(int f_in, struct file_list *flist, char *local_name,
/* log the transfer */
if (log_before_transfer)
/* log the transfer */
if (log_before_transfer)
- log_
recv(file, &initial_stats, iflags
);
+ log_
item(file, &initial_stats, iflags, NULL
);
else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", safe_fname(fname));
else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", safe_fname(fname));
@@
-606,7
+590,7
@@
int recv_files(int f_in, struct file_list *flist, char *local_name,
fname, fd2, file->length);
if (!log_before_transfer)
fname, fd2, file->length);
if (!log_before_transfer)
- log_
recv(file, &initial_stats, iflags
);
+ log_
item(file, &initial_stats, iflags, NULL
);
if (fd1 != -1)
close(fd1);
if (fd1 != -1)
close(fd1);