extern int preserve_specials;
extern int uid_ndx;
extern int gid_ndx;
+extern int eol_nulls;
extern int relative_paths;
extern int implied_dirs;
extern int file_extra_cnt;
extern int protocol_version;
extern int sanitize_paths;
extern struct stats stats;
+extern char *filesfrom_host;
extern char curr_dir[MAXPATHLEN];
if (linkname_len) {
bp = (char*)file->basename + basename_len;
if (first_hlink_ndx >= flist->ndx_start) {
- struct file_struct *first = flist->files[first_hlink_ndx];
+ struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start];
memcpy(bp, F_SYMLINK(first), linkname_len);
} else
read_sbuf(f, bp, linkname_len - 1);
bp = tmp_sum;
}
if (first_hlink_ndx >= flist->ndx_start) {
- struct file_struct *first = flist->files[first_hlink_ndx];
+ struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start];
memcpy(bp, F_SUM(first), checksum_len);
} else
read_buf(f, bp, checksum_len);
int64 start_write;
int use_ff_fd = 0;
int flags, disable_buffering;
+ int reading_remotely = filesfrom_host != NULL;
+ int rl_nulls = eol_nulls || reading_remotely;
rprintf(FLOG, "building file list\n");
if (show_filelist_p())
int is_dot_dir;
if (use_ff_fd) {
- if (read_filesfrom_line(filesfrom_fd, fbuf) == 0)
+ if (read_line(filesfrom_fd, fbuf, sizeof fbuf, !reading_remotely, rl_nulls) == 0)
break;
sanitize_path(fbuf, fbuf, "", 0, NULL);
} else {
dirlen = dir ? strlen(dir) : 0;
if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) {
if (!push_pathname(dir ? strdup(dir) : NULL, dirlen))
- goto push_error;
+ continue;
lastdir = pathname;
lastdir_len = pathname_len;
- } else if (!push_pathname(lastdir, lastdir_len)) {
- push_error:
- io_error |= IOERR_GENERAL;
- rsyserr(FERROR, errno, "push_dir %s failed in %s",
- full_fname(dir), curr_dir);
+ } else if (!push_pathname(lastdir, lastdir_len))
continue;
- }
if (fn != fbuf)
memmove(fbuf, fn, len + 1);