#include "rsync.h"
#include <time.h>
-extern char *batch_name;
+extern int am_sender;
extern int eol_nulls;
extern int recurse;
extern int preserve_links;
extern int preserve_gid;
extern int always_checksum;
extern int protocol_version;
+extern char *batch_name;
extern struct filter_list_struct filter_list;
if (fptr[i]->dirname)
rprintf(FINFO, "flist->dirname=%s\n",
fptr[i]->dirname);
- if (fptr[i]->basedir)
- rprintf(FINFO, "flist->basedir=%s\n",
- fptr[i]->basedir);
+ if (am_sender && fptr[i]->dir.root)
+ rprintf(FINFO, "flist->dir.root=%s\n",
+ fptr[i]->dir.root);
}
}
case 'o': n = op; break;
case 'f':
pathjoin(buf2, sizeof buf2,
- file->basedir ? file->basedir : "",
+ file->dir.root ? file->dir.root : "",
f_name(file));
clean_fname(buf2, 0);
n = buf2;
stats.num_transferred_files++;
stats.total_transferred_size += file->length;
- if (file->basedir) {
+ if (file->dir.root) {
/* N.B. We're sure that this fits, so offset is OK. */
- offset = strlcpy(fname, file->basedir, sizeof fname);
+ offset = strlcpy(fname, file->dir.root, sizeof fname);
if (!offset || fname[offset-1] != '/')
fname[offset++] = '/';
} else