bp += FILE_STRUCT_LEN;
memcpy(bp, basename, basename_len);
- bp += basename_len;
#ifdef SUPPORT_HARD_LINKS
if (xflags & XMIT_HLINKED)
#ifdef SUPPORT_LINKS
if (linkname_len) {
+ bp += basename_len;
if (first_hlink_ndx >= flist->ndx_start) {
struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start];
memcpy(bp, F_SYMLINK(first), linkname_len);
bp += FILE_STRUCT_LEN;
memcpy(bp, basename, basename_len);
- bp += basename_len;
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && flist && flist->prev) {
#ifdef SUPPORT_LINKS
if (linkname_len)
- memcpy(bp, linkname, linkname_len);
+ memcpy(bp + basename_len, linkname, linkname_len);
#endif
if (always_checksum && am_sender && S_ISREG(st.st_mode))