#include "rsync.h"
extern int verbose;
+extern int itemize_changes;
extern int delete_after;
extern int csum_length;
extern struct stats stats;
if (flush_write_file(fd) < 0)
goto report_write_error;
-#if HAVE_FTRUNCATE
+#ifdef HAVE_FTRUNCATE
if (inplace && fd != -1)
ftruncate(fd, offset);
#endif
}
+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);
+ buf[dlen++] = '/';
+ } 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);
+}
+
+
static void discard_receive_data(int f_in, OFF_T length)
{
receive_data(f_in, NULL, -1, 0, NULL, -1, length);
if (verbose > 2)
rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
- if (dry_run) {
- if (!am_server && verbose) /* log the transfer */
+ if (dry_run) { /* log the transfer */
+ if (!am_server && verbose && !itemize_changes)
rprintf(FINFO, "%s\n", safe_fname(fname));
continue;
}
case FNAMECMP_BACKUP:
fnamecmp = get_backup_name(fname);
break;
+ case FNAMECMP_FUZZY:
+ read_gen_name(f_in_name, file->dirname, fnamecmpbuf);
+ fnamecmp = fnamecmpbuf;
+ break;
default:
if (j >= basis_dir_cnt) {
rprintf(FERROR,
cleanup_set(fnametmp, partialptr, file, fd1, fd2);
}
- if (!am_server && verbose) /* log the transfer */
+ /* log the transfer */
+ if (!am_server && verbose && !itemize_changes)
rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */