flist.c

   1 /*
   2  * Generate and receive file lists.
   3  *
   4  * Copyright (C) 1996 Andrew Tridgell
   5  * Copyright (C) 1996 Paul Mackerras
   6  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
   7  * Copyright (C) 2002-2009 Wayne Davison
   8  *
   9  * This program is free software; you can redistribute it and/or modify
  10  * it under the terms of the GNU General Public License as published by
  11  * the Free Software Foundation; either version 3 of the License, or
  12  * (at your option) any later version.
  13  *
  14  * This program is distributed in the hope that it will be useful,
  15  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  16  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  17  * GNU General Public License for more details.
  18  *
  19  * You should have received a copy of the GNU General Public License along
  20  * with this program; if not, visit the http://fsf.org website.
  21  */
  22
  23 #include "rsync.h"
  24 #include "ifuncs.h"
  25 #include "rounding.h"
  26 #include "inums.h"
  27 #include "io.h"
  28
  29 extern int am_root;
  30 extern int am_server;
  31 extern int am_daemon;
  32 extern int am_sender;
  33 extern int am_generator;
  34 extern int inc_recurse;
  35 extern int always_checksum;
  36 extern int module_id;
  37 extern int ignore_errors;
  38 extern int numeric_ids;
  39 extern int recurse;
  40 extern int use_qsort;
  41 extern int xfer_dirs;
  42 extern int filesfrom_fd;
  43 extern int one_file_system;
  44 extern int copy_dirlinks;
  45 extern int keep_dirlinks;
  46 extern int preserve_uid;
  47 extern int preserve_gid;
  48 extern int preserve_acls;
  49 extern int preserve_xattrs;
  50 extern int preserve_links;
  51 extern int preserve_hard_links;
  52 extern int preserve_devices;
  53 extern int preserve_specials;
  54 extern int uid_ndx;
  55 extern int gid_ndx;
  56 extern int eol_nulls;
  57 extern int relative_paths;
  58 extern int implied_dirs;
  59 extern int file_extra_cnt;
  60 extern int ignore_perishable;
  61 extern int non_perishable_cnt;
  62 extern int prune_empty_dirs;
  63 extern int copy_links;
  64 extern int copy_unsafe_links;
  65 extern int protocol_version;
  66 extern int sanitize_paths;
  67 extern int munge_symlinks;
  68 extern int need_unsorted_flist;
  69 extern int sender_symlink_iconv;
  70 extern int output_needs_newline;
  71 extern int sender_keeps_checksum;
  72 extern int unsort_ndx;
  73 extern struct stats stats;
  74 extern char *filesfrom_host;
  75 extern char *usermap, *groupmap;
  76
  77 extern char curr_dir[MAXPATHLEN];
  78
  79 extern struct chmod_mode_struct *chmod_modes;
  80
  81 extern struct filter_list_struct filter_list;
  82 extern struct filter_list_struct daemon_filter_list;
  83
  84 #ifdef ICONV_OPTION
  85 extern int filesfrom_convert;
  86 extern iconv_t ic_send, ic_recv;
  87 #endif
  88
  89 #define PTR_SIZE (sizeof (struct file_struct *))
  90
  91 int io_error;
  92 int checksum_len;
  93 dev_t filesystem_dev; /* used to implement -x */
  94
  95 struct file_list *cur_flist, *first_flist, *dir_flist;
  96 int send_dir_ndx = -1, send_dir_depth = -1;
  97 int flist_cnt = 0; /* how many (non-tmp) file list objects exist */
  98 int file_total = 0; /* total of all active items over all file-lists */
  99 int flist_eof = 0; /* all the file-lists are now known */
 100
 101 #define NORMAL_NAME 0
 102 #define SLASH_ENDING_NAME 1
 103 #define DOTDIR_NAME 2
 104
 105 /* Starting from protocol version 26, we always use 64-bit ino_t and dev_t
 106  * internally, even if this platform does not allow files to have 64-bit inums.
 107  * The only exception is if we're on a platform with no 64-bit type at all.
 108  *
 109  * Because we use read_longint() to get these off the wire, if you transfer
 110  * devices or (for protocols < 30) hardlinks with dev or inum > 2**32 to a
 111  * machine with no 64-bit types then you will get an overflow error.
 112  *
 113  * Note that if you transfer devices from a 64-bit-devt machine (say, Solaris)
 114  * to a 32-bit-devt machine (say, Linux-2.2/x86) then the device numbers will
 115  * be truncated.  But it's a kind of silly thing to do anyhow. */
 116
 117 /* The tmp_* vars are used as a cache area by make_file() to store data
 118  * that the sender doesn't need to remember in its file list.  The data
 119  * will survive just long enough to be used by send_file_entry(). */
 120 static dev_t tmp_rdev;
 121 #ifdef SUPPORT_HARD_LINKS
 122 static int64 tmp_dev, tmp_ino;
 123 #endif
 124 static char tmp_sum[MAX_DIGEST_LEN];
 125
 126 static char empty_sum[MAX_DIGEST_LEN];
 127 static int flist_count_offset; /* for --delete --progress */
 128
 129 static void flist_sort_and_clean(struct file_list *flist, int strip_root);
 130 static void output_flist(struct file_list *flist);
 131
 132 void init_flist(void)
 133 {
 134         if (DEBUG_GTE(FLIST, 4)) {
 135                 rprintf(FINFO, "FILE_STRUCT_LEN=%d, EXTRA_LEN=%d\n",
 136                         (int)FILE_STRUCT_LEN, (int)EXTRA_LEN);
 137         }
 138         checksum_len = protocol_version < 21 ? 2
 139                      : protocol_version < 30 ? MD4_DIGEST_LEN
 140                      : MD5_DIGEST_LEN;
 141 }
 142
 143 static int show_filelist_p(void)
 144 {
 145         return INFO_GTE(FLIST, 1) && xfer_dirs && !am_server && !inc_recurse;
 146 }
 147
 148 static void start_filelist_progress(char *kind)
 149 {
 150         rprintf(FCLIENT, "%s ... ", kind);
 151         output_needs_newline = 1;
 152         rflush(FINFO);
 153 }
 154
 155 static void emit_filelist_progress(int count)
 156 {
 157         rprintf(FCLIENT, " %d files...\r", count);
 158 }
 159
 160 static void maybe_emit_filelist_progress(int count)
 161 {
 162         if (INFO_GTE(FLIST, 2) && show_filelist_p() && (count % 100) == 0)
 163                 emit_filelist_progress(count);
 164 }
 165
 166 static void finish_filelist_progress(const struct file_list *flist)
 167 {
 168         if (INFO_GTE(FLIST, 2)) {
 169                 /* This overwrites the progress line */
 170                 rprintf(FINFO, "%d file%sto consider\n",
 171                         flist->used, flist->used == 1 ? " " : "s ");
 172         } else {
 173                 output_needs_newline = 0;
 174                 rprintf(FINFO, "done\n");
 175         }
 176 }
 177
 178 void show_flist_stats(void)
 179 {
 180         /* Nothing yet */
 181 }
 182
 183 /* Stat either a symlink or its referent, depending on the settings of
 184  * copy_links, copy_unsafe_links, etc.  Returns -1 on error, 0 on success.
 185  *
 186  * If path is the name of a symlink, then the linkbuf buffer (which must hold
 187  * MAXPATHLEN chars) will be set to the symlink's target string.
 188  *
 189  * The stat structure pointed to by stp will contain information about the
 190  * link or the referent as appropriate, if they exist. */
 191 static int readlink_stat(const char *path, STRUCT_STAT *stp, char *linkbuf)
 192 {
 193 #ifdef SUPPORT_LINKS
 194         if (link_stat(path, stp, copy_dirlinks) < 0)
 195                 return -1;
 196         if (S_ISLNK(stp->st_mode)) {
 197                 int llen = readlink(path, linkbuf, MAXPATHLEN - 1);
 198                 if (llen < 0)
 199                         return -1;
 200                 linkbuf[llen] = '\0';
 201                 if (copy_unsafe_links && unsafe_symlink(linkbuf, path)) {
 202                         if (INFO_GTE(SYMSAFE, 1)) {
 203                                 rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n",
 204                                         path, linkbuf);
 205                         }
 206                         return x_stat(path, stp, NULL);
 207                 }
 208                 if (munge_symlinks && am_sender && llen > SYMLINK_PREFIX_LEN
 209                  && strncmp(linkbuf, SYMLINK_PREFIX, SYMLINK_PREFIX_LEN) == 0) {
 210                         memmove(linkbuf, linkbuf + SYMLINK_PREFIX_LEN,
 211                                 llen - SYMLINK_PREFIX_LEN + 1);
 212                 }
 213         }
 214         return 0;
 215 #else
 216         return x_stat(path, stp, NULL);
 217 #endif
 218 }
 219
 220 int link_stat(const char *path, STRUCT_STAT *stp, int follow_dirlinks)
 221 {
 222 #ifdef SUPPORT_LINKS
 223         if (copy_links)
 224                 return x_stat(path, stp, NULL);
 225         if (x_lstat(path, stp, NULL) < 0)
 226                 return -1;
 227         if (follow_dirlinks && S_ISLNK(stp->st_mode)) {
 228                 STRUCT_STAT st;
 229                 if (x_stat(path, &st, NULL) == 0 && S_ISDIR(st.st_mode))
 230                         *stp = st;
 231         }
 232         return 0;
 233 #else
 234         return x_stat(path, stp, NULL);
 235 #endif
 236 }
 237
 238 static inline int is_daemon_excluded(const char *fname, int is_dir)
 239 {
 240         if (daemon_filter_list.head
 241          && check_filter(&daemon_filter_list, FLOG, fname, is_dir) < 0) {
 242                 errno = ENOENT;
 243                 return 1;
 244         }
 245         return 0;
 246 }
 247
 248 static inline int path_is_daemon_excluded(char *path, int ignore_filename)
 249 {
 250         if (daemon_filter_list.head) {
 251                 char *slash = path;
 252
 253                 while ((slash = strchr(slash+1, '/')) != NULL) {
 254                         int ret;
 255                         *slash = '\0';
 256                         ret = check_filter(&daemon_filter_list, FLOG, path, 1);
 257                         *slash = '/';
 258                         if (ret < 0) {
 259                                 errno = ENOENT;
 260                                 return 1;
 261                         }
 262                 }
 263
 264                 if (!ignore_filename
 265                  && check_filter(&daemon_filter_list, FLOG, path, 1) < 0) {
 266                         errno = ENOENT;
 267                         return 1;
 268                 }
 269         }
 270
 271         return 0;
 272 }
 273
 274 /* This function is used to check if a file should be included/excluded
 275  * from the list of files based on its name and type etc.  The value of
 276  * filter_level is set to either SERVER_FILTERS or ALL_FILTERS. */
 277 static int is_excluded(const char *fname, int is_dir, int filter_level)
 278 {
 279 #if 0 /* This currently never happens, so avoid a useless compare. */
 280         if (filter_level == NO_FILTERS)
 281                 return 0;
 282 #endif
 283         if (is_daemon_excluded(fname, is_dir))
 284                 return 1;
 285         if (filter_level != ALL_FILTERS)
 286                 return 0;
 287         if (filter_list.head
 288             && check_filter(&filter_list, FINFO, fname, is_dir) < 0)
 289                 return 1;
 290         return 0;
 291 }
 292
 293 static void send_directory(int f, struct file_list *flist,
 294                            char *fbuf, int len, int flags);
 295
 296 static const char *pathname, *orig_dir;
 297 static int pathname_len;
 298
 299 /* Make sure flist can hold at least flist->used + extra entries. */
 300 static void flist_expand(struct file_list *flist, int extra)
 301 {
 302         struct file_struct **new_ptr;
 303
 304         if (flist->used + extra <= flist->malloced)
 305                 return;
 306
 307         if (flist->malloced < FLIST_START)
 308                 flist->malloced = FLIST_START;
 309         else if (flist->malloced >= FLIST_LINEAR)
 310                 flist->malloced += FLIST_LINEAR;
 311         else
 312                 flist->malloced *= 2;
 313
 314         /* In case count jumped or we are starting the list
 315          * with a known size just set it. */
 316         if (flist->malloced < flist->used + extra)
 317                 flist->malloced = flist->used + extra;
 318
 319         new_ptr = realloc_array(flist->files, struct file_struct *,
 320                                 flist->malloced);
 321
 322         if (DEBUG_GTE(FLIST, 1) && flist->malloced != FLIST_START) {
 323                 rprintf(FCLIENT, "[%s] expand file_list pointer array to %s bytes, did%s move\n",
 324                     who_am_i(),
 325                     big_num(sizeof flist->files[0] * flist->malloced),
 326                     (new_ptr == flist->files) ? " not" : "");
 327         }
 328
 329         flist->files = new_ptr;
 330
 331         if (!flist->files)
 332                 out_of_memory("flist_expand");
 333 }
 334
 335 static void flist_done_allocating(struct file_list *flist)
 336 {
 337         void *ptr = pool_boundary(flist->file_pool, 8*1024);
 338         if (flist->pool_boundary == ptr)
 339                 flist->pool_boundary = NULL; /* list didn't use any pool memory */
 340         else
 341                 flist->pool_boundary = ptr;
 342 }
 343
 344 /* Call this with EITHER (1) "file, NULL, 0" to chdir() to the file's
 345  * F_PATHNAME(), or (2) "NULL, dir, dirlen" to chdir() to the supplied dir,
 346  * with dir == NULL taken to be the starting directory, and dirlen < 0
 347  * indicating that strdup(dir) should be called and then the -dirlen length
 348  * value checked to ensure that it is not daemon-excluded. */
 349 int change_pathname(struct file_struct *file, const char *dir, int dirlen)
 350 {
 351         if (dirlen < 0) {
 352                 char *cpy = strdup(dir);
 353                 if (*cpy != '/')
 354                         change_dir(orig_dir, CD_SKIP_CHDIR);
 355                 if (path_is_daemon_excluded(cpy, 0))
 356                         goto chdir_error;
 357                 dir = cpy;
 358                 dirlen = -dirlen;
 359         } else {
 360                 if (file) {
 361                         if (pathname == F_PATHNAME(file))
 362                                 return 1;
 363                         dir = F_PATHNAME(file);
 364                         if (dir)
 365                                 dirlen = strlen(dir);
 366                 } else if (pathname == dir)
 367                         return 1;
 368                 if (dir && *dir != '/')
 369                         change_dir(orig_dir, CD_SKIP_CHDIR);
 370         }
 371
 372         pathname = dir;
 373         pathname_len = dirlen;
 374
 375         if (!dir)
 376                 dir = orig_dir;
 377
 378         if (!change_dir(dir, CD_NORMAL)) {
 379           chdir_error:
 380                 io_error |= IOERR_GENERAL;
 381                 rsyserr(FERROR_XFER, errno, "change_dir %s failed", full_fname(dir));
 382                 if (dir != orig_dir)
 383                         change_dir(orig_dir, CD_NORMAL);
 384                 pathname = NULL;
 385                 pathname_len = 0;
 386                 return 0;
 387         }
 388
 389         return 1;
 390 }
 391
 392 static void send_file_entry(int f, const char *fname, struct file_struct *file,
 393 #ifdef SUPPORT_LINKS
 394                             const char *symlink_name, int symlink_len,
 395 #endif
 396                             int ndx, int first_ndx)
 397 {
 398         static time_t modtime;
 399         static mode_t mode;
 400 #ifdef SUPPORT_HARD_LINKS
 401         static int64 dev;
 402 #endif
 403         static dev_t rdev;
 404         static uint32 rdev_major;
 405         static uid_t uid;
 406         static gid_t gid;
 407         static const char *user_name, *group_name;
 408         static char lastname[MAXPATHLEN];
 409 #ifdef SUPPORT_HARD_LINKS
 410         int first_hlink_ndx = -1;
 411 #endif
 412         int l1, l2;
 413         int xflags;
 414
 415         /* Initialize starting value of xflags and adjust counts. */
 416         if (S_ISREG(file->mode))
 417                 xflags = 0;
 418         else if (S_ISDIR(file->mode)) {
 419                 stats.num_dirs++;
 420                 if (protocol_version >= 30) {
 421                         if (file->flags & FLAG_CONTENT_DIR)
 422                                 xflags = file->flags & FLAG_TOP_DIR;
 423                         else if (file->flags & FLAG_IMPLIED_DIR)
 424                                 xflags = XMIT_TOP_DIR | XMIT_NO_CONTENT_DIR;
 425                         else
 426                                 xflags = XMIT_NO_CONTENT_DIR;
 427                 } else
 428                         xflags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */
 429         } else {
 430                 if (S_ISLNK(file->mode))
 431                         stats.num_symlinks++;
 432                 else if (IS_DEVICE(file->mode))
 433                         stats.num_devices++;
 434                 else
 435                         stats.num_specials++;
 436                 xflags = 0;
 437         }
 438
 439         if (file->mode == mode)
 440                 xflags |= XMIT_SAME_MODE;
 441         else
 442                 mode = file->mode;
 443
 444         if ((preserve_devices && IS_DEVICE(mode))
 445          || (preserve_specials && IS_SPECIAL(mode))) {
 446                 if (protocol_version < 28) {
 447                         if (tmp_rdev == rdev)
 448                                 xflags |= XMIT_SAME_RDEV_pre28;
 449                         else
 450                                 rdev = tmp_rdev;
 451                 } else {
 452                         rdev = tmp_rdev;
 453                         if ((uint32)major(rdev) == rdev_major)
 454                                 xflags |= XMIT_SAME_RDEV_MAJOR;
 455                         else
 456                                 rdev_major = major(rdev);
 457                         if (protocol_version < 30 && (uint32)minor(rdev) <= 0xFFu)
 458                                 xflags |= XMIT_RDEV_MINOR_8_pre30;
 459                 }
 460         } else if (protocol_version < 28)
 461                 rdev = MAKEDEV(0, 0);
 462         if (!preserve_uid || ((uid_t)F_OWNER(file) == uid && *lastname))
 463                 xflags |= XMIT_SAME_UID;
 464         else {
 465                 uid = F_OWNER(file);
 466                 if (!numeric_ids) {
 467                         user_name = add_uid(uid);
 468                         if (inc_recurse && user_name)
 469                                 xflags |= XMIT_USER_NAME_FOLLOWS;
 470                 }
 471         }
 472         if (!preserve_gid || ((gid_t)F_GROUP(file) == gid && *lastname))
 473                 xflags |= XMIT_SAME_GID;
 474         else {
 475                 gid = F_GROUP(file);
 476                 if (!numeric_ids) {
 477                         group_name = add_gid(gid);
 478                         if (inc_recurse && group_name)
 479                                 xflags |= XMIT_GROUP_NAME_FOLLOWS;
 480                 }
 481         }
 482         if (file->modtime == modtime)
 483                 xflags |= XMIT_SAME_TIME;
 484         else
 485                 modtime = file->modtime;
 486
 487 #ifdef SUPPORT_HARD_LINKS
 488         if (tmp_dev != 0) {
 489                 if (protocol_version >= 30) {
 490                         struct ht_int64_node *np = idev_find(tmp_dev, tmp_ino);
 491                         first_hlink_ndx = (int32)(long)np->data - 1;
 492                         if (first_hlink_ndx < 0) {
 493                                 np->data = (void*)(long)(first_ndx + ndx + 1);
 494                                 xflags |= XMIT_HLINK_FIRST;
 495                         }
 496                         if (DEBUG_GTE(HLINK, 1)) {
 497                                 if (first_hlink_ndx >= 0) {
 498                                         rprintf(FINFO, "[%s] #%d hard-links #%d (%sabbrev)\n",
 499                                                 who_am_i(), first_ndx + ndx, first_hlink_ndx,
 500                                                 first_hlink_ndx >= first_ndx ? "" : "un");
 501                                 } else if (DEBUG_GTE(HLINK, 3)) {
 502                                         rprintf(FINFO, "[%s] dev:inode for #%d is %s:%s\n",
 503                                                 who_am_i(), first_ndx + ndx,
 504                                                 big_num(tmp_dev), big_num(tmp_ino));
 505                                 }
 506                         }
 507                 } else {
 508                         if (tmp_dev == dev) {
 509                                 if (protocol_version >= 28)
 510                                         xflags |= XMIT_SAME_DEV_pre30;
 511                         } else
 512                                 dev = tmp_dev;
 513                 }
 514                 xflags |= XMIT_HLINKED;
 515         }
 516 #endif
 517
 518         for (l1 = 0;
 519             lastname[l1] && (fname[l1] == lastname[l1]) && (l1 < 255);
 520             l1++) {}
 521         l2 = strlen(fname+l1);
 522
 523         if (l1 > 0)
 524                 xflags |= XMIT_SAME_NAME;
 525         if (l2 > 255)
 526                 xflags |= XMIT_LONG_NAME;
 527
 528         /* We must make sure we don't send a zero flag byte or the
 529          * other end will terminate the flist transfer.  Note that
 530          * the use of XMIT_TOP_DIR on a non-dir has no meaning, so
 531          * it's harmless way to add a bit to the first flag byte. */
 532         if (protocol_version >= 28) {
 533                 if (!xflags && !S_ISDIR(mode))
 534                         xflags |= XMIT_TOP_DIR;
 535                 if ((xflags & 0xFF00) || !xflags) {
 536                         xflags |= XMIT_EXTENDED_FLAGS;
 537                         write_shortint(f, xflags);
 538                 } else
 539                         write_byte(f, xflags);
 540         } else {
 541                 if (!(xflags & 0xFF))
 542                         xflags |= S_ISDIR(mode) ? XMIT_LONG_NAME : XMIT_TOP_DIR;
 543                 write_byte(f, xflags);
 544         }
 545         if (xflags & XMIT_SAME_NAME)
 546                 write_byte(f, l1);
 547         if (xflags & XMIT_LONG_NAME)
 548                 write_varint30(f, l2);
 549         else
 550                 write_byte(f, l2);
 551         write_buf(f, fname + l1, l2);
 552
 553 #ifdef SUPPORT_HARD_LINKS
 554         if (first_hlink_ndx >= 0) {
 555                 write_varint(f, first_hlink_ndx);
 556                 if (first_hlink_ndx >= first_ndx)
 557                         goto the_end;
 558         }
 559 #endif
 560
 561         write_varlong30(f, F_LENGTH(file), 3);
 562         if (!(xflags & XMIT_SAME_TIME)) {
 563                 if (protocol_version >= 30)
 564                         write_varlong(f, modtime, 4);
 565                 else
 566                         write_int(f, modtime);
 567         }
 568         if (!(xflags & XMIT_SAME_MODE))
 569                 write_int(f, to_wire_mode(mode));
 570         if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
 571                 if (protocol_version < 30)
 572                         write_int(f, uid);
 573                 else {
 574                         write_varint(f, uid);
 575                         if (xflags & XMIT_USER_NAME_FOLLOWS) {
 576                                 int len = strlen(user_name);
 577                                 write_byte(f, len);
 578                                 write_buf(f, user_name, len);
 579                         }
 580                 }
 581         }
 582         if (preserve_gid && !(xflags & XMIT_SAME_GID)) {
 583                 if (protocol_version < 30)
 584                         write_int(f, gid);
 585                 else {
 586                         write_varint(f, gid);
 587                         if (xflags & XMIT_GROUP_NAME_FOLLOWS) {
 588                                 int len = strlen(group_name);
 589                                 write_byte(f, len);
 590                                 write_buf(f, group_name, len);
 591                         }
 592                 }
 593         }
 594         if ((preserve_devices && IS_DEVICE(mode))
 595          || (preserve_specials && IS_SPECIAL(mode))) {
 596                 if (protocol_version < 28) {
 597                         if (!(xflags & XMIT_SAME_RDEV_pre28))
 598                                 write_int(f, (int)rdev);
 599                 } else {
 600                         if (!(xflags & XMIT_SAME_RDEV_MAJOR))
 601                                 write_varint30(f, major(rdev));
 602                         if (protocol_version >= 30)
 603                                 write_varint(f, minor(rdev));
 604                         else if (xflags & XMIT_RDEV_MINOR_8_pre30)
 605                                 write_byte(f, minor(rdev));
 606                         else
 607                                 write_int(f, minor(rdev));
 608                 }
 609         }
 610
 611 #ifdef SUPPORT_LINKS
 612         if (symlink_len) {
 613                 write_varint30(f, symlink_len);
 614                 write_buf(f, symlink_name, symlink_len);
 615         }
 616 #endif
 617
 618 #ifdef SUPPORT_HARD_LINKS
 619         if (tmp_dev != 0 && protocol_version < 30) {
 620                 if (protocol_version < 26) {
 621                         /* 32-bit dev_t and ino_t */
 622                         write_int(f, (int32)dev);
 623                         write_int(f, (int32)tmp_ino);
 624                 } else {
 625                         /* 64-bit dev_t and ino_t */
 626                         if (!(xflags & XMIT_SAME_DEV_pre30))
 627                                 write_longint(f, dev);
 628                         write_longint(f, tmp_ino);
 629                 }
 630         }
 631 #endif
 632
 633         if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) {
 634                 const char *sum;
 635                 if (S_ISREG(mode))
 636                         sum = tmp_sum;
 637                 else {
 638                         /* Prior to 28, we sent a useless set of nulls. */
 639                         sum = empty_sum;
 640                 }
 641                 write_buf(f, sum, checksum_len);
 642         }
 643
 644 #ifdef SUPPORT_HARD_LINKS
 645   the_end:
 646 #endif
 647         strlcpy(lastname, fname, MAXPATHLEN);
 648
 649         if (S_ISREG(mode) || S_ISLNK(mode))
 650                 stats.total_size += F_LENGTH(file);
 651 }
 652
 653 static struct file_struct *recv_file_entry(struct file_list *flist,
 654                                            int xflags, int f)
 655 {
 656         static int64 modtime;
 657         static mode_t mode;
 658 #ifdef SUPPORT_HARD_LINKS
 659         static int64 dev;
 660 #endif
 661         static dev_t rdev;
 662         static uint32 rdev_major;
 663         static uid_t uid;
 664         static gid_t gid;
 665         static uint16 gid_flags;
 666         static char lastname[MAXPATHLEN], *lastdir;
 667         static int lastdir_depth, lastdir_len = -1;
 668         static unsigned int del_hier_name_len = 0;
 669         static int in_del_hier = 0;
 670         char thisname[MAXPATHLEN];
 671         unsigned int l1 = 0, l2 = 0;
 672         int alloc_len, basename_len, linkname_len;
 673         int extra_len = file_extra_cnt * EXTRA_LEN;
 674         int first_hlink_ndx = -1;
 675         int64 file_length;
 676         const char *basename;
 677         struct file_struct *file;
 678         alloc_pool_t *pool;
 679         char *bp;
 680
 681         if (xflags & XMIT_SAME_NAME)
 682                 l1 = read_byte(f);
 683
 684         if (xflags & XMIT_LONG_NAME)
 685                 l2 = read_varint30(f);
 686         else
 687                 l2 = read_byte(f);
 688
 689         if (l2 >= MAXPATHLEN - l1) {
 690                 rprintf(FERROR,
 691                         "overflow: xflags=0x%x l1=%d l2=%d lastname=%s [%s]\n",
 692                         xflags, l1, l2, lastname, who_am_i());
 693                 overflow_exit("recv_file_entry");
 694         }
 695
 696         strlcpy(thisname, lastname, l1 + 1);
 697         read_sbuf(f, &thisname[l1], l2);
 698         thisname[l1 + l2] = 0;
 699
 700         /* Abuse basename_len for a moment... */
 701         basename_len = strlcpy(lastname, thisname, MAXPATHLEN);
 702
 703 #ifdef ICONV_OPTION
 704         if (ic_recv != (iconv_t)-1) {
 705                 xbuf outbuf, inbuf;
 706
 707                 INIT_CONST_XBUF(outbuf, thisname);
 708                 INIT_XBUF(inbuf, lastname, basename_len, (size_t)-1);
 709
 710                 if (iconvbufs(ic_recv, &inbuf, &outbuf, 0) < 0) {
 711                         io_error |= IOERR_GENERAL;
 712                         rprintf(FERROR_UTF8,
 713                             "[%s] cannot convert filename: %s (%s)\n",
 714                             who_am_i(), lastname, strerror(errno));
 715                         outbuf.len = 0;
 716                 }
 717                 thisname[outbuf.len] = '\0';
 718         }
 719 #endif
 720
 721         if (*thisname)
 722                 clean_fname(thisname, 0);
 723
 724         if (sanitize_paths)
 725                 sanitize_path(thisname, thisname, "", 0, SP_DEFAULT);
 726
 727         if ((basename = strrchr(thisname, '/')) != NULL) {
 728                 int len = basename++ - thisname;
 729                 if (len != lastdir_len || memcmp(thisname, lastdir, len) != 0) {
 730                         lastdir = new_array(char, len + 1);
 731                         memcpy(lastdir, thisname, len);
 732                         lastdir[len] = '\0';
 733                         lastdir_len = len;
 734                         lastdir_depth = count_dir_elements(lastdir);
 735                 }
 736         } else
 737                 basename = thisname;
 738         basename_len = strlen(basename) + 1; /* count the '\0' */
 739
 740 #ifdef SUPPORT_HARD_LINKS
 741         if (protocol_version >= 30
 742          && BITS_SETnUNSET(xflags, XMIT_HLINKED, XMIT_HLINK_FIRST)) {
 743                 first_hlink_ndx = read_varint(f);
 744                 if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->ndx_start + flist->used) {
 745                         rprintf(FERROR,
 746                                 "hard-link reference out of range: %d (%d)\n",
 747                                 first_hlink_ndx, flist->ndx_start + flist->used);
 748                         exit_cleanup(RERR_PROTOCOL);
 749                 }
 750                 if (DEBUG_GTE(HLINK, 1)) {
 751                         rprintf(FINFO, "[%s] #%d hard-links #%d (%sabbrev)\n",
 752                                 who_am_i(), flist->used+flist->ndx_start, first_hlink_ndx,
 753                                 first_hlink_ndx >= flist->ndx_start ? "" : "un");
 754                 }
 755                 if (first_hlink_ndx >= flist->ndx_start) {
 756                         struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start];
 757                         file_length = F_LENGTH(first);
 758                         modtime = first->modtime;
 759                         mode = first->mode;
 760                         if (preserve_uid)
 761                                 uid = F_OWNER(first);
 762                         if (preserve_gid)
 763                                 gid = F_GROUP(first);
 764                         if ((preserve_devices && IS_DEVICE(mode))
 765                          || (preserve_specials && IS_SPECIAL(mode))) {
 766                                 uint32 *devp = F_RDEV_P(first);
 767                                 rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
 768                                 extra_len += DEV_EXTRA_CNT * EXTRA_LEN;
 769                         }
 770                         if (preserve_links && S_ISLNK(mode))
 771                                 linkname_len = strlen(F_SYMLINK(first)) + 1;
 772                         else
 773                                 linkname_len = 0;
 774                         goto create_object;
 775                 }
 776         }
 777 #endif
 778
 779         file_length = read_varlong30(f, 3);
 780         if (!(xflags & XMIT_SAME_TIME)) {
 781                 if (protocol_version >= 30) {
 782                         modtime = read_varlong(f, 4);
 783 #if SIZEOF_TIME_T < SIZEOF_INT64
 784                         if (!am_generator && (int64)(time_t)modtime != modtime) {
 785                                 rprintf(FERROR_XFER,
 786                                     "Time value of %s truncated on receiver.\n",
 787                                     lastname);
 788                         }
 789 #endif
 790                 } else
 791                         modtime = read_int(f);
 792         }
 793         if (!(xflags & XMIT_SAME_MODE))
 794                 mode = from_wire_mode(read_int(f));
 795
 796         if (chmod_modes && !S_ISLNK(mode))
 797                 mode = tweak_mode(mode, chmod_modes);
 798
 799         if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
 800                 if (protocol_version < 30)
 801                         uid = (uid_t)read_int(f);
 802                 else {
 803                         uid = (uid_t)read_varint(f);
 804                         if (xflags & XMIT_USER_NAME_FOLLOWS)
 805                                 uid = recv_user_name(f, uid);
 806                         else if (inc_recurse && am_root && (!numeric_ids || usermap))
 807                                 uid = match_uid(uid);
 808                 }
 809         }
 810         if (preserve_gid && !(xflags & XMIT_SAME_GID)) {
 811                 if (protocol_version < 30)
 812                         gid = (gid_t)read_int(f);
 813                 else {
 814                         gid = (gid_t)read_varint(f);
 815                         gid_flags = 0;
 816                         if (xflags & XMIT_GROUP_NAME_FOLLOWS)
 817                                 gid = recv_group_name(f, gid, &gid_flags);
 818                         else if (inc_recurse && (!am_root || !numeric_ids || groupmap))
 819                                 gid = match_gid(gid, &gid_flags);
 820                 }
 821         }
 822
 823         if ((preserve_devices && IS_DEVICE(mode))
 824          || (preserve_specials && IS_SPECIAL(mode))) {
 825                 if (protocol_version < 28) {
 826                         if (!(xflags & XMIT_SAME_RDEV_pre28))
 827                                 rdev = (dev_t)read_int(f);
 828                 } else {
 829                         uint32 rdev_minor;
 830                         if (!(xflags & XMIT_SAME_RDEV_MAJOR))
 831                                 rdev_major = read_varint30(f);
 832                         if (protocol_version >= 30)
 833                                 rdev_minor = read_varint(f);
 834                         else if (xflags & XMIT_RDEV_MINOR_8_pre30)
 835                                 rdev_minor = read_byte(f);
 836                         else
 837                                 rdev_minor = read_int(f);
 838                         rdev = MAKEDEV(rdev_major, rdev_minor);
 839                 }
 840                 extra_len += DEV_EXTRA_CNT * EXTRA_LEN;
 841                 file_length = 0;
 842         } else if (protocol_version < 28)
 843                 rdev = MAKEDEV(0, 0);
 844
 845 #ifdef SUPPORT_LINKS
 846         if (preserve_links && S_ISLNK(mode)) {
 847                 linkname_len = read_varint30(f) + 1; /* count the '\0' */
 848                 if (linkname_len <= 0 || linkname_len > MAXPATHLEN) {
 849                         rprintf(FERROR, "overflow: linkname_len=%d\n",
 850                                 linkname_len - 1);
 851                         overflow_exit("recv_file_entry");
 852                 }
 853 #ifdef ICONV_OPTION
 854                 /* We don't know how much extra room we need to convert
 855                  * the as-yet-unread symlink data, so let's hope that a
 856                  * double-size buffer is plenty. */
 857                 if (sender_symlink_iconv)
 858                         linkname_len *= 2;
 859 #endif
 860                 if (munge_symlinks)
 861                         linkname_len += SYMLINK_PREFIX_LEN;
 862         }
 863         else
 864 #endif
 865                 linkname_len = 0;
 866
 867 #ifdef SUPPORT_HARD_LINKS
 868   create_object:
 869         if (preserve_hard_links) {
 870                 if (protocol_version < 28 && S_ISREG(mode))
 871                         xflags |= XMIT_HLINKED;
 872                 if (xflags & XMIT_HLINKED)
 873                         extra_len += (inc_recurse+1) * EXTRA_LEN;
 874         }
 875 #endif
 876
 877 #ifdef SUPPORT_ACLS
 878         /* Directories need an extra int32 for the default ACL. */
 879         if (preserve_acls && S_ISDIR(mode))
 880                 extra_len += EXTRA_LEN;
 881 #endif
 882
 883         if (always_checksum && S_ISREG(mode))
 884                 extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
 885
 886 #if SIZEOF_INT64 >= 8
 887         if (file_length > 0xFFFFFFFFu && S_ISREG(mode))
 888                 extra_len += EXTRA_LEN;
 889 #endif
 890         if (file_length < 0) {
 891                 rprintf(FERROR, "Offset underflow: file-length is negative\n");
 892                 exit_cleanup(RERR_UNSUPPORTED);
 893         }
 894
 895         if (inc_recurse && S_ISDIR(mode)) {
 896                 if (one_file_system) {
 897                         /* Room to save the dir's device for -x */
 898                         extra_len += DEV_EXTRA_CNT * EXTRA_LEN;
 899                 }
 900                 pool = dir_flist->file_pool;
 901         } else
 902                 pool = flist->file_pool;
 903
 904 #if EXTRA_ROUNDING > 0
 905         if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
 906                 extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN;
 907 #endif
 908
 909         alloc_len = FILE_STRUCT_LEN + extra_len + basename_len
 910                   + linkname_len;
 911         bp = pool_alloc(pool, alloc_len, "recv_file_entry");
 912
 913         memset(bp, 0, extra_len + FILE_STRUCT_LEN);
 914         bp += extra_len;
 915         file = (struct file_struct *)bp;
 916         bp += FILE_STRUCT_LEN;
 917
 918         memcpy(bp, basename, basename_len);
 919
 920 #ifdef SUPPORT_HARD_LINKS
 921         if (xflags & XMIT_HLINKED)
 922                 file->flags |= FLAG_HLINKED;
 923 #endif
 924         file->modtime = (time_t)modtime;
 925         file->len32 = (uint32)file_length;
 926 #if SIZEOF_INT64 >= 8
 927         if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) {
 928 #if SIZEOF_CAPITAL_OFF_T < 8
 929                 rprintf(FERROR, "Offset overflow: attempted 64-bit file-length\n");
 930                 exit_cleanup(RERR_UNSUPPORTED);
 931 #else
 932                 file->flags |= FLAG_LENGTH64;
 933                 OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32);
 934 #endif
 935         }
 936 #endif
 937         file->mode = mode;
 938         if (preserve_uid)
 939                 F_OWNER(file) = uid;
 940         if (preserve_gid) {
 941                 F_GROUP(file) = gid;
 942                 file->flags |= gid_flags;
 943         }
 944         if (unsort_ndx)
 945                 F_NDX(file) = flist->used + flist->ndx_start;
 946
 947         if (basename != thisname) {
 948                 file->dirname = lastdir;
 949                 F_DEPTH(file) = lastdir_depth + 1;
 950         } else
 951                 F_DEPTH(file) = 1;
 952
 953         if (S_ISDIR(mode)) {
 954                 if (basename_len == 1+1 && *basename == '.') /* +1 for '\0' */
 955                         F_DEPTH(file)--;
 956                 if (protocol_version >= 30) {
 957                         if (!(xflags & XMIT_NO_CONTENT_DIR)) {
 958                                 if (xflags & XMIT_TOP_DIR)
 959                                         file->flags |= FLAG_TOP_DIR;
 960                                 file->flags |= FLAG_CONTENT_DIR;
 961                         } else if (xflags & XMIT_TOP_DIR)
 962                                 file->flags |= FLAG_IMPLIED_DIR;
 963                 } else if (xflags & XMIT_TOP_DIR) {
 964                         in_del_hier = recurse;
 965                         del_hier_name_len = F_DEPTH(file) == 0 ? 0 : l1 + l2;
 966                         if (relative_paths && del_hier_name_len > 2
 967                             && lastname[del_hier_name_len-1] == '.'
 968                             && lastname[del_hier_name_len-2] == '/')
 969                                 del_hier_name_len -= 2;
 970                         file->flags |= FLAG_TOP_DIR | FLAG_CONTENT_DIR;
 971                 } else if (in_del_hier) {
 972                         if (!relative_paths || !del_hier_name_len
 973                          || (l1 >= del_hier_name_len
 974                           && lastname[del_hier_name_len] == '/'))
 975                                 file->flags |= FLAG_CONTENT_DIR;
 976                         else
 977                                 in_del_hier = 0;
 978                 }
 979         }
 980
 981         if ((preserve_devices && IS_DEVICE(mode))
 982          || (preserve_specials && IS_SPECIAL(mode))) {
 983                 uint32 *devp = F_RDEV_P(file);
 984                 DEV_MAJOR(devp) = major(rdev);
 985                 DEV_MINOR(devp) = minor(rdev);
 986         }
 987
 988 #ifdef SUPPORT_LINKS
 989         if (linkname_len) {
 990                 bp += basename_len;
 991                 if (first_hlink_ndx >= flist->ndx_start) {
 992                         struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start];
 993                         memcpy(bp, F_SYMLINK(first), linkname_len);
 994                 } else {
 995                         if (munge_symlinks) {
 996                                 strlcpy(bp, SYMLINK_PREFIX, linkname_len);
 997                                 bp += SYMLINK_PREFIX_LEN;
 998                                 linkname_len -= SYMLINK_PREFIX_LEN;
 999                         }
1000 #ifdef ICONV_OPTION
1001                         if (sender_symlink_iconv) {
1002                                 xbuf outbuf, inbuf;
1003
1004                                 alloc_len = linkname_len;
1005                                 linkname_len /= 2;
1006
1007                                 /* Read the symlink data into the end of our double-sized
1008                                  * buffer and then convert it into the right spot. */
1009                                 INIT_XBUF(inbuf, bp + alloc_len - linkname_len,
1010                                           linkname_len - 1, (size_t)-1);
1011                                 read_sbuf(f, inbuf.buf, inbuf.len);
1012                                 INIT_XBUF(outbuf, bp, 0, alloc_len);
1013
1014                                 if (iconvbufs(ic_recv, &inbuf, &outbuf, 0) < 0) {
1015                                         io_error |= IOERR_GENERAL;
1016                                         rprintf(FERROR_XFER,
1017                                             "[%s] cannot convert symlink data for: %s (%s)\n",
1018                                             who_am_i(), full_fname(thisname), strerror(errno));
1019                                         bp = (char*)file->basename;
1020                                         *bp++ = '\0';
1021                                         outbuf.len = 0;
1022                                 }
1023                                 bp[outbuf.len] = '\0';
1024                         } else
1025 #endif
1026                                 read_sbuf(f, bp, linkname_len - 1);
1027                         if (sanitize_paths && !munge_symlinks && *bp)
1028                                 sanitize_path(bp, bp, "", lastdir_depth, SP_DEFAULT);
1029                 }
1030         }
1031 #endif
1032
1033 #ifdef SUPPORT_HARD_LINKS
1034         if (preserve_hard_links && xflags & XMIT_HLINKED) {
1035                 if (protocol_version >= 30) {
1036                         if (xflags & XMIT_HLINK_FIRST) {
1037                                 F_HL_GNUM(file) = flist->ndx_start + flist->used;
1038                         } else
1039                                 F_HL_GNUM(file) = first_hlink_ndx;
1040                 } else {
1041                         static int32 cnt = 0;
1042                         struct ht_int64_node *np;
1043                         int64 ino;
1044                         int32 ndx;
1045                         if (protocol_version < 26) {
1046                                 dev = read_int(f);
1047                                 ino = read_int(f);
1048                         } else {
1049                                 if (!(xflags & XMIT_SAME_DEV_pre30))
1050                                         dev = read_longint(f);
1051                                 ino = read_longint(f);
1052                         }
1053                         np = idev_find(dev, ino);
1054                         ndx = (int32)(long)np->data - 1;
1055                         if (ndx < 0) {
1056                                 ndx = cnt++;
1057                                 np->data = (void*)(long)cnt;
1058                         }
1059                         F_HL_GNUM(file) = ndx;
1060                 }
1061         }
1062 #endif
1063
1064         if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) {
1065                 if (S_ISREG(mode))
1066                         bp = F_SUM(file);
1067                 else {
1068                         /* Prior to 28, we get a useless set of nulls. */
1069                         bp = tmp_sum;
1070                 }
1071                 if (first_hlink_ndx >= flist->ndx_start) {
1072                         struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start];
1073                         memcpy(bp, F_SUM(first), checksum_len);
1074                 } else
1075                         read_buf(f, bp, checksum_len);
1076         }
1077
1078 #ifdef SUPPORT_ACLS
1079         if (preserve_acls && !S_ISLNK(mode))
1080                 receive_acl(file, f);
1081 #endif
1082 #ifdef SUPPORT_XATTRS
1083         if (preserve_xattrs)
1084                 receive_xattr(file, f );
1085 #endif
1086
1087         if (S_ISREG(mode) || S_ISLNK(mode))
1088                 stats.total_size += file_length;
1089
1090         return file;
1091 }
1092
1093 /* Create a file_struct for a named file by reading its stat() information
1094  * and performing extensive checks against global options.
1095  *
1096  * Returns a pointer to the new file struct, or NULL if there was an error
1097  * or this file should be excluded.
1098  *
1099  * Note: Any error (here or in send_file_name) that results in the omission of
1100  * an existent source file from the file list should set
1101  * "io_error |= IOERR_GENERAL" to avoid deletion of the file from the
1102  * destination if --delete is on. */
1103 struct file_struct *make_file(const char *fname, struct file_list *flist,
1104                               STRUCT_STAT *stp, int flags, int filter_level)
1105 {
1106         static char *lastdir;
1107         static int lastdir_len = -1;
1108         struct file_struct *file;
1109         char thisname[MAXPATHLEN];
1110         char linkname[MAXPATHLEN];
1111         int alloc_len, basename_len, linkname_len;
1112         int extra_len = file_extra_cnt * EXTRA_LEN;
1113         const char *basename;
1114         alloc_pool_t *pool;
1115         STRUCT_STAT st;
1116         char *bp;
1117
1118         if (strlcpy(thisname, fname, sizeof thisname) >= sizeof thisname) {
1119                 io_error |= IOERR_GENERAL;
1120                 rprintf(FERROR_XFER, "skipping overly long name: %s\n", fname);
1121                 return NULL;
1122         }
1123         clean_fname(thisname, 0);
1124         if (sanitize_paths)
1125                 sanitize_path(thisname, thisname, "", 0, SP_DEFAULT);
1126
1127         if (stp && S_ISDIR(stp->st_mode)) {
1128                 st = *stp; /* Needed for "symlink/." with --relative. */
1129                 *linkname = '\0'; /* make IBM code checker happy */
1130         } else if (readlink_stat(thisname, &st, linkname) != 0) {
1131                 int save_errno = errno;
1132                 /* See if file is excluded before reporting an error. */
1133                 if (filter_level != NO_FILTERS
1134                  && (is_excluded(thisname, 0, filter_level)
1135                   || is_excluded(thisname, 1, filter_level))) {
1136                         if (ignore_perishable && save_errno != ENOENT)
1137                                 non_perishable_cnt++;
1138                         return NULL;
1139                 }
1140                 if (save_errno == ENOENT) {
1141 #ifdef SUPPORT_LINKS
1142                         /* When our options tell us to follow a symlink that
1143                          * points nowhere, tell the user about the symlink
1144                          * instead of giving a "vanished" message.  We only
1145                          * dereference a symlink if one of the --copy*links
1146                          * options was specified, so there's no need for the
1147                          * extra lstat() if one of these options isn't on. */
1148                         if ((copy_links || copy_unsafe_links || copy_dirlinks)
1149                          && x_lstat(thisname, &st, NULL) == 0
1150                          && S_ISLNK(st.st_mode)) {
1151                                 io_error |= IOERR_GENERAL;
1152                                 rprintf(FERROR_XFER, "symlink has no referent: %s\n",
1153                                         full_fname(thisname));
1154                         } else
1155 #endif
1156                         {
1157                                 enum logcode c = am_daemon && protocol_version < 28
1158                                                ? FERROR : FWARNING;
1159                                 io_error |= IOERR_VANISHED;
1160                                 rprintf(c, "file has vanished: %s\n",
1161                                         full_fname(thisname));
1162                         }
1163                 } else {
1164                         io_error |= IOERR_GENERAL;
1165                         rsyserr(FERROR_XFER, save_errno, "readlink_stat(%s) failed",
1166                                 full_fname(thisname));
1167                 }
1168                 return NULL;
1169         }
1170
1171         if (filter_level == NO_FILTERS)
1172                 goto skip_filters;
1173
1174         if (S_ISDIR(st.st_mode)) {
1175                 if (!xfer_dirs) {
1176                         rprintf(FINFO, "skipping directory %s\n", thisname);
1177                         return NULL;
1178                 }
1179                 /* -x only affects dirs because we need to avoid recursing
1180                  * into a mount-point directory, not to avoid copying a
1181                  * symlinked file if -L (or similar) was specified. */
1182                 if (one_file_system && st.st_dev != filesystem_dev
1183                  && BITS_SETnUNSET(flags, FLAG_CONTENT_DIR, FLAG_TOP_DIR)) {
1184                         if (one_file_system > 1) {
1185                                 if (INFO_GTE(MOUNT, 1)) {
1186                                         rprintf(FINFO,
1187                                             "[%s] skipping mount-point dir %s\n",
1188                                             who_am_i(), thisname);
1189                                 }
1190                                 return NULL;
1191                         }
1192                         flags |= FLAG_MOUNT_DIR;
1193                         flags &= ~FLAG_CONTENT_DIR;
1194                 }
1195         } else
1196                 flags &= ~FLAG_CONTENT_DIR;
1197
1198         if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) {
1199                 if (ignore_perishable)
1200                         non_perishable_cnt++;
1201                 return NULL;
1202         }
1203
1204         if (lp_ignore_nonreadable(module_id)) {
1205 #ifdef SUPPORT_LINKS
1206                 if (!S_ISLNK(st.st_mode))
1207 #endif
1208                         if (access(thisname, R_OK) != 0)
1209                                 return NULL;
1210         }
1211
1212   skip_filters:
1213
1214         /* Only divert a directory in the main transfer. */
1215         if (flist) {
1216                 if (flist->prev && S_ISDIR(st.st_mode)
1217                  && flags & FLAG_DIVERT_DIRS) {
1218                         /* Room for parent/sibling/next-child info. */
1219                         extra_len += DIRNODE_EXTRA_CNT * EXTRA_LEN;
1220                         if (relative_paths)
1221                                 extra_len += PTR_EXTRA_CNT * EXTRA_LEN;
1222                         pool = dir_flist->file_pool;
1223                 } else
1224                         pool = flist->file_pool;
1225         } else {
1226 #ifdef SUPPORT_ACLS
1227                 /* Directories need an extra int32 for the default ACL. */
1228                 if (preserve_acls && S_ISDIR(st.st_mode))
1229                         extra_len += EXTRA_LEN;
1230 #endif
1231                 pool = NULL;
1232         }
1233
1234         if (DEBUG_GTE(FLIST, 2)) {
1235                 rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
1236                         who_am_i(), thisname, filter_level);
1237         }
1238
1239         if ((basename = strrchr(thisname, '/')) != NULL) {
1240                 int len = basename++ - thisname;
1241                 if (len != lastdir_len || memcmp(thisname, lastdir, len) != 0) {
1242                         lastdir = new_array(char, len + 1);
1243                         memcpy(lastdir, thisname, len);
1244                         lastdir[len] = '\0';
1245                         lastdir_len = len;
1246                 }
1247         } else
1248                 basename = thisname;
1249         basename_len = strlen(basename) + 1; /* count the '\0' */
1250
1251 #ifdef SUPPORT_LINKS
1252         linkname_len = S_ISLNK(st.st_mode) ? strlen(linkname) + 1 : 0;
1253 #else
1254         linkname_len = 0;
1255 #endif
1256
1257 #if SIZEOF_CAPITAL_OFF_T >= 8
1258         if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode))
1259                 extra_len += EXTRA_LEN;
1260 #endif
1261
1262         if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
1263                 file_checksum(thisname, tmp_sum, st.st_size);
1264                 if (sender_keeps_checksum)
1265                         extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
1266         }
1267
1268 #if EXTRA_ROUNDING > 0
1269         if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
1270                 extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN;
1271 #endif
1272
1273         alloc_len = FILE_STRUCT_LEN + extra_len + basename_len
1274                   + linkname_len;
1275         if (pool)
1276                 bp = pool_alloc(pool, alloc_len, "make_file");
1277         else {
1278                 if (!(bp = new_array(char, alloc_len)))
1279                         out_of_memory("make_file");
1280         }
1281
1282         memset(bp, 0, extra_len + FILE_STRUCT_LEN);
1283         bp += extra_len;
1284         file = (struct file_struct *)bp;
1285         bp += FILE_STRUCT_LEN;
1286
1287         memcpy(bp, basename, basename_len);
1288
1289 #ifdef SUPPORT_HARD_LINKS
1290         if (preserve_hard_links && flist && flist->prev) {
1291                 if (protocol_version >= 28
1292                  ? (!S_ISDIR(st.st_mode) && st.st_nlink > 1)
1293                  : S_ISREG(st.st_mode)) {
1294                         tmp_dev = (int64)st.st_dev + 1;
1295                         tmp_ino = (int64)st.st_ino;
1296                 } else
1297                         tmp_dev = 0;
1298         }
1299 #endif
1300
1301 #ifdef HAVE_STRUCT_STAT_ST_RDEV
1302         if (IS_DEVICE(st.st_mode) || IS_SPECIAL(st.st_mode)) {
1303                 tmp_rdev = st.st_rdev;
1304                 st.st_size = 0;
1305         }
1306 #endif
1307
1308         file->flags = flags;
1309         file->modtime = st.st_mtime;
1310         file->len32 = (uint32)st.st_size;
1311 #if SIZEOF_CAPITAL_OFF_T >= 8
1312         if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode)) {
1313                 file->flags |= FLAG_LENGTH64;
1314                 OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32);
1315         }
1316 #endif
1317         file->mode = st.st_mode;
1318         if (uid_ndx) /* Check uid_ndx instead of preserve_uid for del support */
1319                 F_OWNER(file) = st.st_uid;
1320         if (gid_ndx) /* Check gid_ndx instead of preserve_gid for del support */
1321                 F_GROUP(file) = st.st_gid;
1322
1323         if (basename != thisname)
1324                 file->dirname = lastdir;
1325
1326 #ifdef SUPPORT_LINKS
1327         if (linkname_len)
1328                 memcpy(bp + basename_len, linkname, linkname_len);
1329 #endif
1330
1331         if (am_sender)
1332                 F_PATHNAME(file) = pathname;
1333         else if (!pool)
1334                 F_DEPTH(file) = extra_len / EXTRA_LEN;
1335
1336         if (basename_len == 0+1) {
1337                 if (!pool)
1338                         unmake_file(file);
1339                 return NULL;
1340         }
1341
1342         if (sender_keeps_checksum && S_ISREG(st.st_mode))
1343                 memcpy(F_SUM(file), tmp_sum, checksum_len);
1344
1345         if (unsort_ndx)
1346                 F_NDX(file) = stats.num_dirs;
1347
1348         return file;
1349 }
1350
1351 /* Only called for temporary file_struct entries created by make_file(). */
1352 void unmake_file(struct file_struct *file)
1353 {
1354         free(REQ_EXTRA(file, F_DEPTH(file)));
1355 }
1356
1357 static struct file_struct *send_file_name(int f, struct file_list *flist,
1358                                           const char *fname, STRUCT_STAT *stp,
1359                                           int flags, int filter_level)
1360 {
1361         struct file_struct *file;
1362
1363         file = make_file(fname, flist, stp, flags, filter_level);
1364         if (!file)
1365                 return NULL;
1366
1367         if (chmod_modes && !S_ISLNK(file->mode))
1368                 file->mode = tweak_mode(file->mode, chmod_modes);
1369
1370         if (f >= 0) {
1371                 char fbuf[MAXPATHLEN];
1372 #ifdef SUPPORT_LINKS
1373                 const char *symlink_name;
1374                 int symlink_len;
1375 #ifdef ICONV_OPTION
1376                 char symlink_buf[MAXPATHLEN];
1377 #endif
1378 #endif
1379 #if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
1380                 stat_x sx;
1381                 init_stat_x(&sx);
1382 #endif
1383
1384 #ifdef SUPPORT_LINKS
1385                 if (preserve_links && S_ISLNK(file->mode)) {
1386                         symlink_name = F_SYMLINK(file);
1387                         symlink_len = strlen(symlink_name);
1388                 } else {
1389                         symlink_name = NULL;
1390                         symlink_len = 0;
1391                 }
1392 #endif
1393
1394 #ifdef ICONV_OPTION
1395                 if (ic_send != (iconv_t)-1) {
1396                         xbuf outbuf, inbuf;
1397
1398                         INIT_CONST_XBUF(outbuf, fbuf);
1399
1400                         if (file->dirname) {
1401                                 INIT_XBUF_STRLEN(inbuf, (char*)file->dirname);
1402                                 outbuf.size -= 2; /* Reserve room for '/' & 1 more char. */
1403                                 if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0)
1404                                         goto convert_error;
1405                                 outbuf.size += 2;
1406                                 fbuf[outbuf.len++] = '/';
1407                         }
1408
1409                         INIT_XBUF_STRLEN(inbuf, (char*)file->basename);
1410                         if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0) {
1411                           convert_error:
1412                                 io_error |= IOERR_GENERAL;
1413                                 rprintf(FERROR_XFER,
1414                                     "[%s] cannot convert filename: %s (%s)\n",
1415                                     who_am_i(), f_name(file, fbuf), strerror(errno));
1416                                 return NULL;
1417                         }
1418                         fbuf[outbuf.len] = '\0';
1419
1420 #ifdef SUPPORT_LINKS
1421                         if (symlink_len && sender_symlink_iconv) {
1422                                 INIT_XBUF(inbuf, (char*)symlink_name, symlink_len, (size_t)-1);
1423                                 INIT_CONST_XBUF(outbuf, symlink_buf);
1424                                 if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0) {
1425                                         io_error |= IOERR_GENERAL;
1426                                         f_name(file, fbuf);
1427                                         rprintf(FERROR_XFER,
1428                                             "[%s] cannot convert symlink data for: %s (%s)\n",
1429                                             who_am_i(), full_fname(fbuf), strerror(errno));
1430                                         return NULL;
1431                                 }
1432                                 symlink_buf[outbuf.len] = '\0';
1433
1434                                 symlink_name = symlink_buf;
1435                                 symlink_len = outbuf.len;
1436                         }
1437 #endif
1438                 } else
1439 #endif
1440                         f_name(file, fbuf);
1441
1442 #ifdef SUPPORT_ACLS
1443                 if (preserve_acls && !S_ISLNK(file->mode)) {
1444                         sx.st.st_mode = file->mode;
1445                         if (get_acl(fname, &sx) < 0) {
1446                                 io_error |= IOERR_GENERAL;
1447                                 return NULL;
1448                         }
1449                 }
1450 #endif
1451 #ifdef SUPPORT_XATTRS
1452                 if (preserve_xattrs) {
1453                         if (get_xattr(fname, &sx) < 0) {
1454                                 io_error |= IOERR_GENERAL;
1455                                 return NULL;
1456                         }
1457                 }
1458 #endif
1459
1460                 send_file_entry(f, fbuf, file,
1461 #ifdef SUPPORT_LINKS
1462                                 symlink_name, symlink_len,
1463 #endif
1464                                 flist->used, flist->ndx_start);
1465
1466 #ifdef SUPPORT_ACLS
1467                 if (preserve_acls && !S_ISLNK(file->mode)) {
1468                         send_acl(&sx, f);
1469                         free_acl(&sx);
1470                 }
1471 #endif
1472 #ifdef SUPPORT_XATTRS
1473                 if (preserve_xattrs) {
1474                         F_XATTR(file) = send_xattr(&sx, f);
1475                         free_xattr(&sx);
1476                 }
1477 #endif
1478         }
1479
1480         maybe_emit_filelist_progress(flist->used + flist_count_offset);
1481
1482         flist_expand(flist, 1);
1483         flist->files[flist->used++] = file;
1484
1485         return file;
1486 }
1487
1488 static void send_if_directory(int f, struct file_list *flist,
1489                               struct file_struct *file,
1490                               char *fbuf, unsigned int ol,
1491                               int flags)
1492 {
1493         char is_dot_dir = fbuf[ol-1] == '.' && (ol == 1 || fbuf[ol-2] == '/');
1494
1495         if (S_ISDIR(file->mode)
1496             && !(file->flags & FLAG_MOUNT_DIR) && f_name(file, fbuf)) {
1497                 void *save_filters;
1498                 unsigned int len = strlen(fbuf);
1499                 if (len > 1 && fbuf[len-1] == '/')
1500                         fbuf[--len] = '\0';
1501                 if (len >= MAXPATHLEN - 1) {
1502                         io_error |= IOERR_GENERAL;
1503                         rprintf(FERROR_XFER, "skipping long-named directory: %s\n",
1504                                 full_fname(fbuf));
1505                         return;
1506                 }
1507                 save_filters = push_local_filters(fbuf, len);
1508                 send_directory(f, flist, fbuf, len, flags);
1509                 pop_local_filters(save_filters);
1510                 fbuf[ol] = '\0';
1511                 if (is_dot_dir)
1512                         fbuf[ol-1] = '.';
1513         }
1514 }
1515
1516 static int file_compare(const void *file1, const void *file2)
1517 {
1518         return f_name_cmp(*(struct file_struct **)file1,
1519                           *(struct file_struct **)file2);
1520 }
1521
1522 /* The guts of a merge-sort algorithm.  This was derived from the glibc
1523  * version, but I (Wayne) changed the merge code to do less copying and
1524  * to require only half the amount of temporary memory. */
1525 static void fsort_tmp(struct file_struct **fp, size_t num,
1526                       struct file_struct **tmp)
1527 {
1528         struct file_struct **f1, **f2, **t;
1529         size_t n1, n2;
1530
1531         n1 = num / 2;
1532         n2 = num - n1;
1533         f1 = fp;
1534         f2 = fp + n1;
1535
1536         if (n1 > 1)
1537                 fsort_tmp(f1, n1, tmp);
1538         if (n2 > 1)
1539                 fsort_tmp(f2, n2, tmp);
1540
1541         while (f_name_cmp(*f1, *f2) <= 0) {
1542                 if (!--n1)
1543                         return;
1544                 f1++;
1545         }
1546
1547         t = tmp;
1548         memcpy(t, f1, n1 * PTR_SIZE);
1549
1550         *f1++ = *f2++, n2--;
1551
1552         while (n1 > 0 && n2 > 0) {
1553                 if (f_name_cmp(*t, *f2) <= 0)
1554                         *f1++ = *t++, n1--;
1555                 else
1556                         *f1++ = *f2++, n2--;
1557         }
1558
1559         if (n1 > 0)
1560                 memcpy(f1, t, n1 * PTR_SIZE);
1561 }
1562
1563 /* This file-struct sorting routine makes sure that any identical names in
1564  * the file list stay in the same order as they were in the original list.
1565  * This is particularly vital in inc_recurse mode where we expect a sort
1566  * on the flist to match the exact order of a sort on the dir_flist. */
1567 static void fsort(struct file_struct **fp, size_t num)
1568 {
1569         if (num <= 1)
1570                 return;
1571
1572         if (use_qsort)
1573                 qsort(fp, num, PTR_SIZE, file_compare);
1574         else {
1575                 struct file_struct **tmp = new_array(struct file_struct *,
1576                                                      (num+1) / 2);
1577                 fsort_tmp(fp, num, tmp);
1578                 free(tmp);
1579         }
1580 }
1581
1582 /* We take an entire set of sibling dirs from the sorted flist and link them
1583  * into the tree, setting the appropriate parent/child/sibling pointers. */
1584 static void add_dirs_to_tree(int parent_ndx, struct file_list *from_flist,
1585                              int dir_cnt)
1586 {
1587         int i;
1588         int32 *dp = NULL;
1589         int32 *parent_dp = parent_ndx < 0 ? NULL
1590                          : F_DIR_NODE_P(dir_flist->sorted[parent_ndx]);
1591
1592         flist_expand(dir_flist, dir_cnt);
1593         dir_flist->sorted = dir_flist->files;
1594
1595         for (i = 0; dir_cnt; i++) {
1596                 struct file_struct *file = from_flist->sorted[i];
1597
1598                 if (!S_ISDIR(file->mode))
1599                         continue;
1600
1601                 dir_flist->files[dir_flist->used++] = file;
1602                 dir_cnt--;
1603
1604                 if (file->basename[0] == '.' && file->basename[1] == '\0')
1605                         continue;
1606
1607                 if (dp)
1608                         DIR_NEXT_SIBLING(dp) = dir_flist->used - 1;
1609                 else if (parent_dp)
1610                         DIR_FIRST_CHILD(parent_dp) = dir_flist->used - 1;
1611                 else
1612                         send_dir_ndx = dir_flist->used - 1;
1613
1614                 dp = F_DIR_NODE_P(file);
1615                 DIR_PARENT(dp) = parent_ndx;
1616                 DIR_FIRST_CHILD(dp) = -1;
1617         }
1618         if (dp)
1619                 DIR_NEXT_SIBLING(dp) = -1;
1620 }
1621
1622 /* This function is normally called by the sender, but the receiving side also
1623  * calls it from get_dirlist() with f set to -1 so that we just construct the
1624  * file list in memory without sending it over the wire.  Also, get_dirlist()
1625  * might call this with f set to -2, which also indicates that local filter
1626  * rules should be ignored. */
1627 static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
1628                            int flags)
1629 {
1630         struct dirent *di;
1631         unsigned remainder;
1632         char *p;
1633         DIR *d;
1634         int divert_dirs = (flags & FLAG_DIVERT_DIRS) != 0;
1635         int start = flist->used;
1636         int filter_level = f == -2 ? SERVER_FILTERS : ALL_FILTERS;
1637
1638         assert(flist != NULL);
1639
1640         if (!(d = opendir(fbuf))) {
1641                 if (errno == ENOENT)
1642                         return;
1643                 io_error |= IOERR_GENERAL;
1644                 rsyserr(FERROR_XFER, errno, "opendir %s failed", full_fname(fbuf));
1645                 return;
1646         }
1647
1648         p = fbuf + len;
1649         if (len != 1 || *fbuf != '/')
1650                 *p++ = '/';
1651         *p = '\0';
1652         remainder = MAXPATHLEN - (p - fbuf);
1653
1654         for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
1655                 char *dname = d_name(di);
1656                 if (dname[0] == '.' && (dname[1] == '\0'
1657                     || (dname[1] == '.' && dname[2] == '\0')))
1658                         continue;
1659                 if (strlcpy(p, dname, remainder) >= remainder) {
1660                         io_error |= IOERR_GENERAL;
1661                         rprintf(FERROR_XFER,
1662                                 "cannot send long-named file %s\n",
1663                                 full_fname(fbuf));
1664                         continue;
1665                 }
1666                 if (dname[0] == '\0') {
1667                         io_error |= IOERR_GENERAL;
1668                         rprintf(FERROR_XFER,
1669                                 "cannot send file with empty name in %s\n",
1670                                 full_fname(fbuf));
1671                         continue;
1672                 }
1673
1674                 send_file_name(f, flist, fbuf, NULL, flags, filter_level);
1675         }
1676
1677         fbuf[len] = '\0';
1678
1679         if (errno) {
1680                 io_error |= IOERR_GENERAL;
1681                 rsyserr(FERROR_XFER, errno, "readdir(%s)", full_fname(fbuf));
1682         }
1683
1684         closedir(d);
1685
1686         if (f >= 0 && recurse && !divert_dirs) {
1687                 int i, end = flist->used - 1;
1688                 /* send_if_directory() bumps flist->used, so use "end". */
1689                 for (i = start; i <= end; i++)
1690                         send_if_directory(f, flist, flist->files[i], fbuf, len, flags);
1691         }
1692 }
1693
1694 static void send_implied_dirs(int f, struct file_list *flist, char *fname,
1695                               char *start, char *limit, int flags, char name_type)
1696 {
1697         static char lastpath[MAXPATHLEN] = "";
1698         static int lastpath_len = 0;
1699         static struct file_struct *lastpath_struct = NULL;
1700         struct file_struct *file;
1701         item_list *relname_list;
1702         relnamecache **rnpp;
1703         int len, need_new_dir, depth = 0;
1704         struct filter_list_struct save_filter_list = filter_list;
1705
1706         flags = (flags | FLAG_IMPLIED_DIR) & ~(FLAG_TOP_DIR | FLAG_CONTENT_DIR);
1707         filter_list.head = filter_list.tail = NULL; /* Don't filter implied dirs. */
1708
1709         if (inc_recurse) {
1710                 if (lastpath_struct && F_PATHNAME(lastpath_struct) == pathname
1711                  && lastpath_len == limit - fname
1712                  && strncmp(lastpath, fname, lastpath_len) == 0)
1713                         need_new_dir = 0;
1714                 else
1715                         need_new_dir = 1;
1716         } else {
1717                 char *tp = fname, *lp = lastpath;
1718                 /* Skip any initial directories in our path that we
1719                  * have in common with lastpath. */
1720                 assert(start == fname);
1721                 for ( ; ; tp++, lp++) {
1722                         if (tp == limit) {
1723                                 if (*lp == '/' || *lp == '\0')
1724                                         goto done;
1725                                 break;
1726                         }
1727                         if (*lp != *tp)
1728                                 break;
1729                         if (*tp == '/') {
1730                                 start = tp;
1731                                 depth++;
1732                         }
1733                 }
1734                 need_new_dir = 1;
1735         }
1736
1737         if (need_new_dir) {
1738                 int save_copy_links = copy_links;
1739                 int save_xfer_dirs = xfer_dirs;
1740                 char *slash;
1741
1742                 copy_links = xfer_dirs = 1;
1743
1744                 *limit = '\0';
1745
1746                 for (slash = start; (slash = strchr(slash+1, '/')) != NULL; ) {
1747                         *slash = '\0';
1748                         file = send_file_name(f, flist, fname, NULL, flags, ALL_FILTERS);
1749                         depth++;
1750                         if (!inc_recurse && file && S_ISDIR(file->mode))
1751                                 change_local_filter_dir(fname, strlen(fname), depth);
1752                         *slash = '/';
1753                 }
1754
1755                 file = send_file_name(f, flist, fname, NULL, flags, ALL_FILTERS);
1756                 if (inc_recurse) {
1757                         if (file && !S_ISDIR(file->mode))
1758                                 file = NULL;
1759                         lastpath_struct = file;
1760                 } else if (file && S_ISDIR(file->mode))
1761                         change_local_filter_dir(fname, strlen(fname), ++depth);
1762
1763                 strlcpy(lastpath, fname, sizeof lastpath);
1764                 lastpath_len = limit - fname;
1765
1766                 *limit = '/';
1767
1768                 copy_links = save_copy_links;
1769                 xfer_dirs = save_xfer_dirs;
1770
1771                 if (!inc_recurse)
1772                         goto done;
1773         }
1774
1775         if (!lastpath_struct)
1776                 goto done; /* dir must have vanished */
1777
1778         len = strlen(limit+1);
1779         memcpy(&relname_list, F_DIR_RELNAMES_P(lastpath_struct), sizeof relname_list);
1780         if (!relname_list) {
1781                 if (!(relname_list = new0(item_list)))
1782                         out_of_memory("send_implied_dirs");
1783                 memcpy(F_DIR_RELNAMES_P(lastpath_struct), &relname_list, sizeof relname_list);
1784         }
1785         rnpp = EXPAND_ITEM_LIST(relname_list, relnamecache *, 32);
1786         if (!(*rnpp = (relnamecache*)new_array(char, sizeof (relnamecache) + len)))
1787                 out_of_memory("send_implied_dirs");
1788         (*rnpp)->name_type = name_type;
1789         strlcpy((*rnpp)->fname, limit+1, len + 1);
1790
1791 done:
1792         filter_list = save_filter_list;
1793 }
1794
1795 static void send1extra(int f, struct file_struct *file, struct file_list *flist)
1796 {
1797         char fbuf[MAXPATHLEN];
1798         item_list *relname_list;
1799         int len, dlen, flags = FLAG_DIVERT_DIRS | FLAG_CONTENT_DIR;
1800         size_t j;
1801
1802         f_name(file, fbuf);
1803         dlen = strlen(fbuf);
1804
1805         if (!change_pathname(file, NULL, 0))
1806                 exit_cleanup(RERR_FILESELECT);
1807
1808         change_local_filter_dir(fbuf, dlen, send_dir_depth);
1809
1810         if (file->flags & FLAG_CONTENT_DIR) {
1811                 if (one_file_system) {
1812                         STRUCT_STAT st;
1813                         if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
1814                                 io_error |= IOERR_GENERAL;
1815                                 rsyserr(FERROR_XFER, errno, "link_stat %s failed",
1816                                         full_fname(fbuf));
1817                                 return;
1818                         }
1819                         filesystem_dev = st.st_dev;
1820                 }
1821                 send_directory(f, flist, fbuf, dlen, flags);
1822         }
1823
1824         if (!relative_paths)
1825                 return;
1826
1827         memcpy(&relname_list, F_DIR_RELNAMES_P(file), sizeof relname_list);
1828         if (!relname_list)
1829                 return;
1830
1831         for (j = 0; j < relname_list->count; j++) {
1832                 char *slash;
1833                 relnamecache *rnp = ((relnamecache**)relname_list->items)[j];
1834                 char name_type = rnp->name_type;
1835
1836                 fbuf[dlen] = '/';
1837                 len = strlcpy(fbuf + dlen + 1, rnp->fname, sizeof fbuf - dlen - 1);
1838                 free(rnp);
1839                 if (len >= (int)sizeof fbuf)
1840                         continue; /* Impossible... */
1841
1842                 slash = strchr(fbuf+dlen+1, '/');
1843                 if (slash) {
1844                         send_implied_dirs(f, flist, fbuf, fbuf+dlen+1, slash, flags, name_type);
1845                         continue;
1846                 }
1847
1848                 if (name_type != NORMAL_NAME) {
1849                         STRUCT_STAT st;
1850                         if (link_stat(fbuf, &st, 1) != 0) {
1851                                 io_error |= IOERR_GENERAL;
1852                                 rsyserr(FERROR_XFER, errno, "link_stat %s failed",
1853                                         full_fname(fbuf));
1854                                 continue;
1855                         }
1856                         send_file_name(f, flist, fbuf, &st, FLAG_TOP_DIR | flags, ALL_FILTERS);
1857                 } else
1858                         send_file_name(f, flist, fbuf, NULL, FLAG_TOP_DIR | flags, ALL_FILTERS);
1859         }
1860
1861         free(relname_list);
1862 }
1863
1864 void send_extra_file_list(int f, int at_least)
1865 {
1866         struct file_list *flist;
1867         int64 start_write;
1868         uint16 prev_flags;
1869         int old_cnt, save_io_error = io_error;
1870
1871         if (flist_eof)
1872                 return;
1873
1874         /* Keep sending data until we have the requested number of
1875          * files in the upcoming file-lists. */
1876         old_cnt = cur_flist->used;
1877         for (flist = first_flist; flist != cur_flist; flist = flist->next)
1878                 old_cnt += flist->used;
1879         while (file_total - old_cnt < at_least) {
1880                 struct file_struct *file = dir_flist->sorted[send_dir_ndx];
1881                 int dir_ndx, dstart = stats.num_dirs;
1882                 const char *pathname = F_PATHNAME(file);
1883                 int32 *dp;
1884
1885                 flist = flist_new(0, "send_extra_file_list");
1886                 start_write = stats.total_written;
1887
1888                 if (unsort_ndx)
1889                         dir_ndx = F_NDX(file);
1890                 else
1891                         dir_ndx = send_dir_ndx;
1892                 write_ndx(f, NDX_FLIST_OFFSET - dir_ndx);
1893                 flist->parent_ndx = dir_ndx;
1894
1895                 send1extra(f, file, flist);
1896                 prev_flags = file->flags;
1897                 dp = F_DIR_NODE_P(file);
1898
1899                 /* If there are any duplicate directory names that follow, we
1900                  * send all the dirs together in one file-list.  The dir_flist
1901                  * tree links all the child subdirs onto the last dup dir. */
1902                 while ((dir_ndx = DIR_NEXT_SIBLING(dp)) >= 0
1903                     && dir_flist->sorted[dir_ndx]->flags & FLAG_DUPLICATE) {
1904                         send_dir_ndx = dir_ndx;
1905                         file = dir_flist->sorted[dir_ndx];
1906                         /* Try to avoid some duplicate scanning of identical dirs. */
1907                         if (F_PATHNAME(file) == pathname && prev_flags & FLAG_CONTENT_DIR)
1908                                 file->flags &= ~FLAG_CONTENT_DIR;
1909                         send1extra(f, file, flist);
1910                         prev_flags = file->flags;
1911                         dp = F_DIR_NODE_P(file);
1912                 }
1913
1914                 if (protocol_version < 31 || io_error == save_io_error || ignore_errors)
1915                         write_byte(f, 0);
1916                 else {
1917                         write_shortint(f, XMIT_EXTENDED_FLAGS|XMIT_IO_ERROR_ENDLIST);
1918                         write_int(f, io_error);
1919                 }
1920
1921                 if (need_unsorted_flist) {
1922                         if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
1923                                 out_of_memory("send_extra_file_list");
1924                         memcpy(flist->sorted, flist->files,
1925                                flist->used * sizeof (struct file_struct*));
1926                 } else
1927                         flist->sorted = flist->files;
1928
1929                 flist_sort_and_clean(flist, 0);
1930
1931                 add_dirs_to_tree(send_dir_ndx, flist, stats.num_dirs - dstart);
1932                 flist_done_allocating(flist);
1933
1934                 file_total += flist->used;
1935                 stats.flist_size += stats.total_written - start_write;
1936                 stats.num_files += flist->used;
1937                 if (DEBUG_GTE(FLIST, 3))
1938                         output_flist(flist);
1939
1940                 if (DIR_FIRST_CHILD(dp) >= 0) {
1941                         send_dir_ndx = DIR_FIRST_CHILD(dp);
1942                         send_dir_depth++;
1943                 } else {
1944                         while (DIR_NEXT_SIBLING(dp) < 0) {
1945                                 if ((send_dir_ndx = DIR_PARENT(dp)) < 0) {
1946                                         write_ndx(f, NDX_FLIST_EOF);
1947                                         flist_eof = 1;
1948                                         change_local_filter_dir(NULL, 0, 0);
1949                                         goto finish;
1950                                 }
1951                                 send_dir_depth--;
1952                                 file = dir_flist->sorted[send_dir_ndx];
1953                                 dp = F_DIR_NODE_P(file);
1954                         }
1955                         send_dir_ndx = DIR_NEXT_SIBLING(dp);
1956                 }
1957         }
1958
1959   finish:
1960         if (io_error != save_io_error && protocol_version == 30 && !ignore_errors)
1961                 send_msg_int(MSG_IO_ERROR, io_error);
1962 }
1963
1964 struct file_list *send_file_list(int f, int argc, char *argv[])
1965 {
1966         static const char *lastdir;
1967         static int lastdir_len = -1;
1968         int len, dirlen;
1969         STRUCT_STAT st;
1970         char *p, *dir;
1971         struct file_list *flist;
1972         struct timeval start_tv, end_tv;
1973         int64 start_write;
1974         int use_ff_fd = 0;
1975         int disable_buffering;
1976         int flags = recurse ? FLAG_CONTENT_DIR : 0;
1977         int reading_remotely = filesfrom_host != NULL;
1978         int rl_flags = (reading_remotely ? 0 : RL_DUMP_COMMENTS)
1979 #ifdef ICONV_OPTION
1980                      | (filesfrom_convert ? RL_CONVERT : 0)
1981 #endif
1982                      | (eol_nulls || reading_remotely ? RL_EOL_NULLS : 0);
1983         int implied_dot_dir = 0;
1984
1985         rprintf(FLOG, "building file list\n");
1986         if (show_filelist_p())
1987                 start_filelist_progress("building file list");
1988         else if (inc_recurse && INFO_GTE(FLIST, 1) && !am_server)
1989                 rprintf(FCLIENT, "sending incremental file list\n");
1990
1991         start_write = stats.total_written;
1992         gettimeofday(&start_tv, NULL);
1993
1994         if (relative_paths && protocol_version >= 30)
1995                 implied_dirs = 1; /* We send flagged implied dirs */
1996
1997 #ifdef SUPPORT_HARD_LINKS
1998         if (preserve_hard_links && protocol_version >= 30 && !cur_flist)
1999                 init_hard_links();
2000 #endif
2001
2002         flist = cur_flist = flist_new(0, "send_file_list");
2003         if (inc_recurse) {
2004                 dir_flist = flist_new(FLIST_TEMP, "send_file_list");
2005                 flags |= FLAG_DIVERT_DIRS;
2006         } else
2007                 dir_flist = cur_flist;
2008
2009         disable_buffering = io_start_buffering_out(f);
2010         if (filesfrom_fd >= 0) {
2011                 if (argv[0] && !change_dir(argv[0], CD_NORMAL)) {
2012                         rsyserr(FERROR_XFER, errno, "change_dir %s failed",
2013                                 full_fname(argv[0]));
2014                         exit_cleanup(RERR_FILESELECT);
2015                 }
2016                 use_ff_fd = 1;
2017         }
2018
2019         if (!orig_dir)
2020                 orig_dir = strdup(curr_dir);
2021
2022         while (1) {
2023                 char fbuf[MAXPATHLEN], *fn, name_type;
2024
2025                 if (use_ff_fd) {
2026                         if (read_line(filesfrom_fd, fbuf, sizeof fbuf, rl_flags) == 0)
2027                                 break;
2028                         sanitize_path(fbuf, fbuf, "", 0, SP_KEEP_DOT_DIRS);
2029                 } else {
2030                         if (argc-- == 0)
2031                                 break;
2032                         strlcpy(fbuf, *argv++, MAXPATHLEN);
2033                         if (sanitize_paths)
2034                                 sanitize_path(fbuf, fbuf, "", 0, SP_KEEP_DOT_DIRS);
2035                 }
2036
2037                 len = strlen(fbuf);
2038                 if (relative_paths) {
2039                         /* We clean up fbuf below. */
2040                         name_type = NORMAL_NAME;
2041                 } else if (!len || fbuf[len - 1] == '/') {
2042                         if (len == 2 && fbuf[0] == '.') {
2043                                 /* Turn "./" into just "." rather than "./." */
2044                                 fbuf[--len] = '\0';
2045                         } else {
2046                                 if (len + 1 >= MAXPATHLEN)
2047                                         overflow_exit("send_file_list");
2048                                 fbuf[len++] = '.';
2049                                 fbuf[len] = '\0';
2050                         }
2051                         name_type = DOTDIR_NAME;
2052                 } else if (len > 1 && fbuf[len-1] == '.' && fbuf[len-2] == '.'
2053                     && (len == 2 || fbuf[len-3] == '/')) {
2054                         if (len + 2 >= MAXPATHLEN)
2055                                 overflow_exit("send_file_list");
2056                         fbuf[len++] = '/';
2057                         fbuf[len++] = '.';
2058                         fbuf[len] = '\0';
2059                         name_type = DOTDIR_NAME;
2060                 } else if (fbuf[len-1] == '.' && (len == 1 || fbuf[len-2] == '/'))
2061                         name_type = DOTDIR_NAME;
2062                 else
2063                         name_type = NORMAL_NAME;
2064
2065                 dir = NULL;
2066
2067                 if (!relative_paths) {
2068                         p = strrchr(fbuf, '/');
2069                         if (p) {
2070                                 *p = '\0';
2071                                 if (p == fbuf)
2072                                         dir = "/";
2073                                 else
2074                                         dir = fbuf;
2075                                 len -= p - fbuf + 1;
2076                                 fn = p + 1;
2077                         } else
2078                                 fn = fbuf;
2079                 } else {
2080                         if ((p = strstr(fbuf, "/./")) != NULL) {
2081                                 *p = '\0';
2082                                 if (p == fbuf)
2083                                         dir = "/";
2084                                 else {
2085                                         dir = fbuf;
2086                                         clean_fname(dir, 0);
2087                                 }
2088                                 fn = p + 3;
2089                                 while (*fn == '/')
2090                                         fn++;
2091                                 if (!*fn)
2092                                         *--fn = '\0'; /* ensure room for '.' */
2093                         } else
2094                                 fn = fbuf;
2095                         /* A leading ./ can be used in relative mode to affect
2096                          * the dest dir without its name being in the path. */
2097                         if (*fn == '.' && fn[1] == '/' && !implied_dot_dir) {
2098                                 send_file_name(f, flist, ".", NULL,
2099                                     (flags | FLAG_IMPLIED_DIR) & ~FLAG_CONTENT_DIR,
2100                                     ALL_FILTERS);
2101                                 implied_dot_dir = 1;
2102                         }
2103                         len = clean_fname(fn, CFN_KEEP_TRAILING_SLASH
2104                                             | CFN_DROP_TRAILING_DOT_DIR);
2105                         if (len == 1) {
2106                                 if (fn[0] == '/') {
2107                                         fn = "/.";
2108                                         len = 2;
2109                                         name_type = DOTDIR_NAME;
2110                                 } else if (fn[0] == '.')
2111                                         name_type = DOTDIR_NAME;
2112                         } else if (fn[len-1] == '/') {
2113                                 fn[--len] = '\0';
2114                                 if (len == 1 && *fn == '.')
2115                                         name_type = DOTDIR_NAME;
2116                                 else
2117                                         name_type = SLASH_ENDING_NAME;
2118                         }
2119                         /* Reject a ".." dir in the active part of the path. */
2120                         for (p = fn; (p = strstr(p, "..")) != NULL; p += 2) {
2121                                 if ((p[2] == '/' || p[2] == '\0')
2122                                  && (p == fn || p[-1] == '/')) {
2123                                         rprintf(FERROR,
2124                                             "found \"..\" dir in relative path: %s\n",
2125                                             fn);
2126                                         exit_cleanup(RERR_SYNTAX);
2127                                 }
2128                         }
2129                 }
2130
2131                 if (!*fn) {
2132                         len = 1;
2133                         fn = ".";
2134                         name_type = DOTDIR_NAME;
2135                 }
2136
2137                 dirlen = dir ? strlen(dir) : 0;
2138                 if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) {
2139                         if (!change_pathname(NULL, dir, -dirlen))
2140                                 continue;
2141                         lastdir = pathname;
2142                         lastdir_len = pathname_len;
2143                 } else if (!change_pathname(NULL, lastdir, lastdir_len))
2144                         continue;
2145
2146                 if (fn != fbuf)
2147                         memmove(fbuf, fn, len + 1);
2148
2149                 if (link_stat(fbuf, &st, copy_dirlinks || name_type != NORMAL_NAME) != 0
2150                  || (name_type != DOTDIR_NAME && is_daemon_excluded(fbuf, S_ISDIR(st.st_mode)))
2151                  || (relative_paths && path_is_daemon_excluded(fbuf, 1))) {
2152                         io_error |= IOERR_GENERAL;
2153                         rsyserr(FERROR_XFER, errno, "link_stat %s failed",
2154                                 full_fname(fbuf));
2155                         continue;
2156                 }
2157
2158                 /* A dot-dir should not be excluded! */
2159                 if (name_type != DOTDIR_NAME
2160                  && is_excluded(fbuf, S_ISDIR(st.st_mode) != 0, ALL_FILTERS))
2161                         continue;
2162
2163                 if (S_ISDIR(st.st_mode) && !xfer_dirs) {
2164                         rprintf(FINFO, "skipping directory %s\n", fbuf);
2165                         continue;
2166                 }
2167
2168                 if (inc_recurse && relative_paths && *fbuf) {
2169                         if ((p = strchr(fbuf+1, '/')) != NULL) {
2170                                 if (p - fbuf == 1 && *fbuf == '.') {
2171                                         if ((fn = strchr(p+1, '/')) != NULL)
2172                                                 p = fn;
2173                                 } else
2174                                         fn = p;
2175                                 send_implied_dirs(f, flist, fbuf, fbuf, p, flags, name_type);
2176                                 if (fn == p)
2177                                         continue;
2178                         }
2179                 } else if (implied_dirs && (p=strrchr(fbuf,'/')) && p != fbuf) {
2180                         /* Send the implied directories at the start of the
2181                          * source spec, so we get their permissions right. */
2182                         send_implied_dirs(f, flist, fbuf, fbuf, p, flags, 0);
2183                 }
2184
2185                 if (one_file_system)
2186                         filesystem_dev = st.st_dev;
2187
2188                 if (recurse || (xfer_dirs && name_type != NORMAL_NAME)) {
2189                         struct file_struct *file;
2190                         file = send_file_name(f, flist, fbuf, &st,
2191                                               FLAG_TOP_DIR | FLAG_CONTENT_DIR | flags,
2192                                               NO_FILTERS);
2193                         if (!file)
2194                                 continue;
2195                         if (inc_recurse) {
2196                                 if (name_type == DOTDIR_NAME) {
2197                                         if (send_dir_depth < 0) {
2198                                                 send_dir_depth = 0;
2199                                                 change_local_filter_dir(fbuf, len, send_dir_depth);
2200                                         }
2201                                         send_directory(f, flist, fbuf, len, flags);
2202                                 }
2203                         } else
2204                                 send_if_directory(f, flist, file, fbuf, len, flags);
2205                 } else
2206                         send_file_name(f, flist, fbuf, &st, flags, NO_FILTERS);
2207         }
2208
2209         gettimeofday(&end_tv, NULL);
2210         stats.flist_buildtime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
2211                               + (end_tv.tv_usec - start_tv.tv_usec) / 1000;
2212         if (stats.flist_buildtime == 0)
2213                 stats.flist_buildtime = 1;
2214         start_tv = end_tv;
2215
2216         /* Indicate end of file list */
2217         if (protocol_version < 31 || io_error == 0 || ignore_errors)
2218                 write_byte(f, 0);
2219         else {
2220                 write_shortint(f, XMIT_EXTENDED_FLAGS|XMIT_IO_ERROR_ENDLIST);
2221                 write_int(f, io_error);
2222         }
2223
2224 #ifdef SUPPORT_HARD_LINKS
2225         if (preserve_hard_links && protocol_version >= 30 && !inc_recurse)
2226                 idev_destroy();
2227 #endif
2228
2229         if (show_filelist_p())
2230                 finish_filelist_progress(flist);
2231
2232         gettimeofday(&end_tv, NULL);
2233         stats.flist_xfertime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
2234                              + (end_tv.tv_usec - start_tv.tv_usec) / 1000;
2235
2236         /* When converting names, both sides keep an unsorted file-list array
2237          * because the names will differ on the sending and receiving sides
2238          * (both sides will use the unsorted index number for each item). */
2239
2240         /* Sort the list without removing any duplicates.  This allows the
2241          * receiving side to ask for whatever name it kept.  For incremental
2242          * recursion mode, the sender marks duplicate dirs so that it can
2243          * send them together in a single file-list. */
2244         if (need_unsorted_flist) {
2245                 if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
2246                         out_of_memory("send_file_list");
2247                 memcpy(flist->sorted, flist->files,
2248                        flist->used * sizeof (struct file_struct*));
2249         } else
2250                 flist->sorted = flist->files;
2251         flist_sort_and_clean(flist, 0);
2252         file_total += flist->used;
2253
2254         if (numeric_ids <= 0 && !inc_recurse)
2255                 send_id_list(f);
2256
2257         /* send the io_error flag */
2258         if (protocol_version < 30)
2259                 write_int(f, ignore_errors ? 0 : io_error);
2260         else if (io_error && protocol_version == 30 && !ignore_errors)
2261                 send_msg_int(MSG_IO_ERROR, io_error);
2262
2263         if (disable_buffering)
2264                 io_end_buffering_out();
2265
2266         stats.flist_size = stats.total_written - start_write;
2267         stats.num_files = flist->used;
2268
2269         if (DEBUG_GTE(FLIST, 3))
2270                 output_flist(flist);
2271
2272         if (DEBUG_GTE(FLIST, 2))
2273                 rprintf(FINFO, "send_file_list done\n");
2274
2275         if (inc_recurse) {
2276                 send_dir_depth = 1;
2277                 add_dirs_to_tree(-1, flist, stats.num_dirs);
2278                 if (!file_total || strcmp(flist->sorted[flist->low]->basename, ".") != 0)
2279                         flist->parent_ndx = -1;
2280                 flist_done_allocating(flist);
2281                 if (send_dir_ndx < 0) {
2282                         write_ndx(f, NDX_FLIST_EOF);
2283                         flist_eof = 1;
2284                 }
2285                 else if (file_total == 1) {
2286                         /* If we're creating incremental file-lists and there
2287                          * was just 1 item in the first file-list, send 1 more
2288                          * file-list to check if this is a 1-file xfer. */
2289                         send_extra_file_list(f, 1);
2290                 }
2291         }
2292
2293         return flist;
2294 }
2295
2296 struct file_list *recv_file_list(int f)
2297 {
2298         struct file_list *flist;
2299         int dstart, flags;
2300         int64 start_read;
2301
2302         if (!first_flist) {
2303                 if (show_filelist_p())
2304                         start_filelist_progress("receiving file list");
2305                 else if (inc_recurse && INFO_GTE(FLIST, 1) && !am_server)
2306                         rprintf(FCLIENT, "receiving incremental file list\n");
2307                 rprintf(FLOG, "receiving file list\n");
2308                 if (usermap)
2309                         parse_name_map(usermap, True);
2310                 if (groupmap)
2311                         parse_name_map(groupmap, False);
2312         }
2313
2314         start_read = stats.total_read;
2315
2316 #ifdef SUPPORT_HARD_LINKS
2317         if (preserve_hard_links && !first_flist)
2318                 init_hard_links();
2319 #endif
2320
2321         flist = flist_new(0, "recv_file_list");
2322
2323         if (inc_recurse) {
2324                 if (flist->ndx_start == 1)
2325                         dir_flist = flist_new(FLIST_TEMP, "recv_file_list");
2326                 dstart = dir_flist->used;
2327         } else {
2328                 dir_flist = flist;
2329                 dstart = 0;
2330         }
2331
2332         while ((flags = read_byte(f)) != 0) {
2333                 struct file_struct *file;
2334
2335                 if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS))
2336                         flags |= read_byte(f) << 8;
2337
2338                 if (flags == (XMIT_EXTENDED_FLAGS|XMIT_IO_ERROR_ENDLIST)) {
2339                         int err;
2340                         if (protocol_version < 31) {
2341                                 rprintf(FERROR, "Invalid flist flag: %x\n", flags);
2342                                 exit_cleanup(RERR_PROTOCOL);
2343                         }
2344                         err = read_int(f);
2345                         if (!ignore_errors)
2346                                 io_error |= err;
2347                         break;
2348                 }
2349
2350                 flist_expand(flist, 1);
2351                 file = recv_file_entry(flist, flags, f);
2352
2353                 if (S_ISREG(file->mode)) {
2354                         /* Already counted */
2355                 } else if (S_ISDIR(file->mode)) {
2356                         if (inc_recurse) {
2357                                 flist_expand(dir_flist, 1);
2358                                 dir_flist->files[dir_flist->used++] = file;
2359                         }
2360                         stats.num_dirs++;
2361                 } else if (S_ISLNK(file->mode))
2362                         stats.num_symlinks++;
2363                 else if (IS_DEVICE(file->mode))
2364                         stats.num_symlinks++;
2365                 else
2366                         stats.num_specials++;
2367
2368                 flist->files[flist->used++] = file;
2369
2370                 maybe_emit_filelist_progress(flist->used);
2371
2372                 if (DEBUG_GTE(FLIST, 2)) {
2373                         char *name = f_name(file, NULL);
2374                         rprintf(FINFO, "recv_file_name(%s)\n", NS(name));
2375                 }
2376         }
2377         file_total += flist->used;
2378
2379         if (DEBUG_GTE(FLIST, 2))
2380                 rprintf(FINFO, "received %d names\n", flist->used);
2381
2382         if (show_filelist_p())
2383                 finish_filelist_progress(flist);
2384
2385         if (need_unsorted_flist) {
2386                 /* Create an extra array of index pointers that we can sort for
2387                  * the generator's use (for wading through the files in sorted
2388                  * order and for calling flist_find()).  We keep the "files"
2389                  * list unsorted for our exchange of index numbers with the
2390                  * other side (since their names may not sort the same). */
2391                 if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
2392                         out_of_memory("recv_file_list");
2393                 memcpy(flist->sorted, flist->files,
2394                        flist->used * sizeof (struct file_struct*));
2395                 if (inc_recurse && dir_flist->used > dstart) {
2396                         static int dir_flist_malloced = 0;
2397                         if (dir_flist_malloced < dir_flist->malloced) {
2398                                 dir_flist->sorted = realloc_array(dir_flist->sorted,
2399                                                         struct file_struct *,
2400                                                         dir_flist->malloced);
2401                                 dir_flist_malloced = dir_flist->malloced;
2402                         }
2403                         memcpy(dir_flist->sorted + dstart, dir_flist->files + dstart,
2404                                (dir_flist->used - dstart) * sizeof (struct file_struct*));
2405                         fsort(dir_flist->sorted + dstart, dir_flist->used - dstart);
2406                 }
2407         } else {
2408                 flist->sorted = flist->files;
2409                 if (inc_recurse && dir_flist->used > dstart) {
2410                         dir_flist->sorted = dir_flist->files;
2411                         fsort(dir_flist->sorted + dstart, dir_flist->used - dstart);
2412                 }
2413         }
2414
2415         if (inc_recurse)
2416                 flist_done_allocating(flist);
2417         else if (f >= 0)
2418                 recv_id_list(f, flist);
2419
2420         flist_sort_and_clean(flist, relative_paths);
2421
2422         if (protocol_version < 30) {
2423                 /* Recv the io_error flag */
2424                 int err = read_int(f);
2425                 if (!ignore_errors)
2426                         io_error |= err;
2427         } else if (inc_recurse && flist->ndx_start == 1) {
2428                 if (!file_total || strcmp(flist->sorted[flist->low]->basename, ".") != 0)
2429                         flist->parent_ndx = -1;
2430         }
2431
2432         if (DEBUG_GTE(FLIST, 3))
2433                 output_flist(flist);
2434
2435         if (DEBUG_GTE(FLIST, 2))
2436                 rprintf(FINFO, "recv_file_list done\n");
2437
2438         stats.flist_size += stats.total_read - start_read;
2439         stats.num_files += flist->used;
2440
2441         return flist;
2442 }
2443
2444 /* This is only used once by the receiver if the very first file-list
2445  * has exactly one item in it. */
2446 void recv_additional_file_list(int f)
2447 {
2448         struct file_list *flist;
2449         int ndx = read_ndx(f);
2450         if (ndx == NDX_FLIST_EOF) {
2451                 flist_eof = 1;
2452                 change_local_filter_dir(NULL, 0, 0);
2453         } else {
2454                 ndx = NDX_FLIST_OFFSET - ndx;
2455                 if (ndx < 0 || ndx >= dir_flist->used) {
2456                         ndx = NDX_FLIST_OFFSET - ndx;
2457                         rprintf(FERROR,
2458                                 "[%s] Invalid dir index: %d (%d - %d)\n",
2459                                 who_am_i(), ndx, NDX_FLIST_OFFSET,
2460                                 NDX_FLIST_OFFSET - dir_flist->used + 1);
2461                         exit_cleanup(RERR_PROTOCOL);
2462                 }
2463                 if (DEBUG_GTE(FLIST, 3)) {
2464                         rprintf(FINFO, "[%s] receiving flist for dir %d\n",
2465                                 who_am_i(), ndx);
2466                 }
2467                 flist = recv_file_list(f);
2468                 flist->parent_ndx = ndx;
2469         }
2470 }
2471
2472 /* Search for an identically-named item in the file list.  Note that the
2473  * items must agree in their directory-ness, or no match is returned. */
2474 int flist_find(struct file_list *flist, struct file_struct *f)
2475 {
2476         int low = flist->low, high = flist->high;
2477         int diff, mid, mid_up;
2478
2479         while (low <= high) {
2480                 mid = (low + high) / 2;
2481                 if (F_IS_ACTIVE(flist->sorted[mid]))
2482                         mid_up = mid;
2483                 else {
2484                         /* Scan for the next non-empty entry using the cached
2485                          * distance values.  If the value isn't fully up-to-
2486                          * date, update it. */
2487                         mid_up = mid + F_DEPTH(flist->sorted[mid]);
2488                         if (!F_IS_ACTIVE(flist->sorted[mid_up])) {
2489                                 do {
2490                                     mid_up += F_DEPTH(flist->sorted[mid_up]);
2491                                 } while (!F_IS_ACTIVE(flist->sorted[mid_up]));
2492                                 F_DEPTH(flist->sorted[mid]) = mid_up - mid;
2493                         }
2494                         if (mid_up > high) {
2495                                 /* If there's nothing left above us, set high to
2496                                  * a non-empty entry below us and continue. */
2497                                 high = mid - (int)flist->sorted[mid]->len32;
2498                                 if (!F_IS_ACTIVE(flist->sorted[high])) {
2499                                         do {
2500                                             high -= (int)flist->sorted[high]->len32;
2501                                         } while (!F_IS_ACTIVE(flist->sorted[high]));
2502                                         flist->sorted[mid]->len32 = mid - high;
2503                                 }
2504                                 continue;
2505                         }
2506                 }
2507                 diff = f_name_cmp(flist->sorted[mid_up], f);
2508                 if (diff == 0) {
2509                         if (protocol_version < 29
2510                             && S_ISDIR(flist->sorted[mid_up]->mode)
2511                             != S_ISDIR(f->mode))
2512                                 return -1;
2513                         return mid_up;
2514                 }
2515                 if (diff < 0)
2516                         low = mid_up + 1;
2517                 else
2518                         high = mid - 1;
2519         }
2520         return -1;
2521 }
2522
2523 /* Search for an identically-named item in the file list.  Differs from
2524  * flist_find in that an item that agrees with "f" in directory-ness is
2525  * preferred but one that does not is still found. */
2526 int flist_find_ignore_dirness(struct file_list *flist, struct file_struct *f)
2527 {
2528         mode_t save_mode;
2529         int ndx;
2530
2531         /* First look for an item that agrees in directory-ness. */
2532         ndx = flist_find(flist, f);
2533         if (ndx >= 0)
2534                 return ndx;
2535
2536         /* Temporarily flip f->mode to look for an item of opposite
2537          * directory-ness. */
2538         save_mode = f->mode;
2539         f->mode = S_ISDIR(f->mode) ? S_IFREG : S_IFDIR;
2540         ndx = flist_find(flist, f);
2541         f->mode = save_mode;
2542         return ndx;
2543 }
2544
2545 /*
2546  * Free up any resources a file_struct has allocated
2547  * and clear the file.
2548  */
2549 void clear_file(struct file_struct *file)
2550 {
2551         /* The +1 zeros out the first char of the basename. */
2552         memset(file, 0, FILE_STRUCT_LEN + 1);
2553         /* In an empty entry, F_DEPTH() is an offset to the next non-empty
2554          * entry.  Likewise for len32 in the opposite direction.  We assume
2555          * that we're alone for now since flist_find() will adjust the counts
2556          * it runs into that aren't up-to-date. */
2557         file->len32 = F_DEPTH(file) = 1;
2558 }
2559
2560 /* Allocate a new file list. */
2561 struct file_list *flist_new(int flags, char *msg)
2562 {
2563         struct file_list *flist;
2564
2565         if (!(flist = new0(struct file_list)))
2566                 out_of_memory(msg);
2567
2568         if (flags & FLIST_TEMP) {
2569                 if (!(flist->file_pool = pool_create(SMALL_EXTENT, 0,
2570                                                      out_of_memory,
2571                                                      POOL_INTERN)))
2572                         out_of_memory(msg);
2573         } else {
2574                 /* This is a doubly linked list with prev looping back to
2575                  * the end of the list, but the last next pointer is NULL. */
2576                 if (!first_flist) {
2577                         flist->file_pool = pool_create(NORMAL_EXTENT, 0,
2578                                                        out_of_memory,
2579                                                        POOL_INTERN);
2580                         if (!flist->file_pool)
2581                                 out_of_memory(msg);
2582
2583                         flist->ndx_start = flist->flist_num = inc_recurse ? 1 : 0;
2584
2585                         first_flist = cur_flist = flist->prev = flist;
2586                 } else {
2587                         struct file_list *prev = first_flist->prev;
2588
2589                         flist->file_pool = first_flist->file_pool;
2590
2591                         flist->ndx_start = prev->ndx_start + prev->used + 1;
2592                         flist->flist_num = prev->flist_num + 1;
2593
2594                         flist->prev = prev;
2595                         prev->next = first_flist->prev = flist;
2596                 }
2597                 flist->pool_boundary = pool_boundary(flist->file_pool, 0);
2598                 flist_cnt++;
2599         }
2600
2601         return flist;
2602 }
2603
2604 /* Free up all elements in a flist. */
2605 void flist_free(struct file_list *flist)
2606 {
2607         if (!flist->prev) {
2608                 /* Was FLIST_TEMP dir-list. */
2609         } else if (flist == flist->prev) {
2610                 first_flist = cur_flist = NULL;
2611                 file_total = 0;
2612                 flist_cnt = 0;
2613         } else {
2614                 if (flist == cur_flist)
2615                         cur_flist = flist->next;
2616                 if (flist == first_flist)
2617                         first_flist = first_flist->next;
2618                 else {
2619                         flist->prev->next = flist->next;
2620                         if (!flist->next)
2621                                 flist->next = first_flist;
2622                 }
2623                 flist->next->prev = flist->prev;
2624                 file_total -= flist->used;
2625                 flist_cnt--;
2626         }
2627
2628         if (!flist->prev || !flist_cnt)
2629                 pool_destroy(flist->file_pool);
2630         else
2631                 pool_free_old(flist->file_pool, flist->pool_boundary);
2632
2633         if (flist->sorted && flist->sorted != flist->files)
2634                 free(flist->sorted);
2635         free(flist->files);
2636         free(flist);
2637 }
2638
2639 /* This routine ensures we don't have any duplicate names in our file list.
2640  * duplicate names can cause corruption because of the pipelining. */
2641 static void flist_sort_and_clean(struct file_list *flist, int strip_root)
2642 {
2643         char fbuf[MAXPATHLEN];
2644         int i, prev_i;
2645
2646         if (!flist)
2647                 return;
2648         if (flist->used == 0) {
2649                 flist->high = -1;
2650                 flist->low = 0;
2651                 return;
2652         }
2653
2654         fsort(flist->sorted, flist->used);
2655
2656         if (!am_sender || inc_recurse) {
2657                 for (i = prev_i = 0; i < flist->used; i++) {
2658                         if (F_IS_ACTIVE(flist->sorted[i])) {
2659                                 prev_i = i;
2660                                 break;
2661                         }
2662                 }
2663                 flist->low = prev_i;
2664         } else {
2665                 i = prev_i = flist->used - 1;
2666                 flist->low = 0;
2667         }
2668
2669         while (++i < flist->used) {
2670                 int j;
2671                 struct file_struct *file = flist->sorted[i];
2672
2673                 if (!F_IS_ACTIVE(file))
2674                         continue;
2675                 if (f_name_cmp(file, flist->sorted[prev_i]) == 0)
2676                         j = prev_i;
2677                 else if (protocol_version >= 29 && S_ISDIR(file->mode)) {
2678                         int save_mode = file->mode;
2679                         /* Make sure that this directory doesn't duplicate a
2680                          * non-directory earlier in the list. */
2681                         flist->high = prev_i;
2682                         file->mode = S_IFREG;
2683                         j = flist_find(flist, file);
2684                         file->mode = save_mode;
2685                 } else
2686                         j = -1;
2687                 if (j >= 0) {
2688                         int keep, drop;
2689                         /* If one is a dir and the other is not, we want to
2690                          * keep the dir because it might have contents in the
2691                          * list.  Otherwise keep the first one. */
2692                         if (S_ISDIR(file->mode)) {
2693                                 struct file_struct *fp = flist->sorted[j];
2694                                 if (!S_ISDIR(fp->mode))
2695                                         keep = i, drop = j;
2696                                 else {
2697                                         if (am_sender)
2698                                                 file->flags |= FLAG_DUPLICATE;
2699                                         else { /* Make sure we merge our vital flags. */
2700                                                 fp->flags |= file->flags & (FLAG_TOP_DIR|FLAG_CONTENT_DIR);
2701                                                 fp->flags &= file->flags | ~FLAG_IMPLIED_DIR;
2702                                         }
2703                                         keep = j, drop = i;
2704                                 }
2705                         } else
2706                                 keep = j, drop = i;
2707
2708                         if (!am_sender) {
2709                                 if (DEBUG_GTE(DUP, 1)) {
2710                                         rprintf(FINFO,
2711                                             "removing duplicate name %s from file list (%d)\n",
2712                                             f_name(file, fbuf), drop + flist->ndx_start);
2713                                 }
2714                                 clear_file(flist->sorted[drop]);
2715                         }
2716
2717                         if (keep == i) {
2718                                 if (flist->low == drop) {
2719                                         for (j = drop + 1;
2720                                              j < i && !F_IS_ACTIVE(flist->sorted[j]);
2721                                              j++) {}
2722                                         flist->low = j;
2723                                 }
2724                                 prev_i = i;
2725                         }
2726                 } else
2727                         prev_i = i;
2728         }
2729         flist->high = prev_i;
2730
2731         if (strip_root) {
2732                 /* We need to strip off the leading slashes for relative
2733                  * paths, but this must be done _after_ the sorting phase. */
2734                 for (i = flist->low; i <= flist->high; i++) {
2735                         struct file_struct *file = flist->sorted[i];
2736
2737                         if (!file->dirname)
2738                                 continue;
2739                         while (*file->dirname == '/')
2740                                 file->dirname++;
2741                         if (!*file->dirname)
2742                                 file->dirname = NULL;
2743                 }
2744         }
2745
2746         if (prune_empty_dirs && !am_sender) {
2747                 int j, prev_depth = 0;
2748
2749                 prev_i = 0; /* It's OK that this isn't really true. */
2750
2751                 for (i = flist->low; i <= flist->high; i++) {
2752                         struct file_struct *fp, *file = flist->sorted[i];
2753
2754                         /* This temporarily abuses the F_DEPTH() value for a
2755                          * directory that is in a chain that might get pruned.
2756                          * We restore the old value if it gets a reprieve. */
2757                         if (S_ISDIR(file->mode) && F_DEPTH(file)) {
2758                                 /* Dump empty dirs when coming back down. */
2759                                 for (j = prev_depth; j >= F_DEPTH(file); j--) {
2760                                         fp = flist->sorted[prev_i];
2761                                         if (F_DEPTH(fp) >= 0)
2762                                                 break;
2763                                         prev_i = -F_DEPTH(fp)-1;
2764                                         clear_file(fp);
2765                                 }
2766                                 prev_depth = F_DEPTH(file);
2767                                 if (is_excluded(f_name(file, fbuf), 1,
2768                                                        ALL_FILTERS)) {
2769                                         /* Keep dirs through this dir. */
2770                                         for (j = prev_depth-1; ; j--) {
2771                                                 fp = flist->sorted[prev_i];
2772                                                 if (F_DEPTH(fp) >= 0)
2773                                                         break;
2774                                                 prev_i = -F_DEPTH(fp)-1;
2775                                                 F_DEPTH(fp) = j;
2776                                         }
2777                                 } else
2778                                         F_DEPTH(file) = -prev_i-1;
2779                                 prev_i = i;
2780                         } else {
2781                                 /* Keep dirs through this non-dir. */
2782                                 for (j = prev_depth; ; j--) {
2783                                         fp = flist->sorted[prev_i];
2784                                         if (F_DEPTH(fp) >= 0)
2785                                                 break;
2786                                         prev_i = -F_DEPTH(fp)-1;
2787                                         F_DEPTH(fp) = j;
2788                                 }
2789                         }
2790                 }
2791                 /* Dump all remaining empty dirs. */
2792                 while (1) {
2793                         struct file_struct *fp = flist->sorted[prev_i];
2794                         if (F_DEPTH(fp) >= 0)
2795                                 break;
2796                         prev_i = -F_DEPTH(fp)-1;
2797                         clear_file(fp);
2798                 }
2799
2800                 for (i = flist->low; i <= flist->high; i++) {
2801                         if (F_IS_ACTIVE(flist->sorted[i]))
2802                                 break;
2803                 }
2804                 flist->low = i;
2805                 for (i = flist->high; i >= flist->low; i--) {
2806                         if (F_IS_ACTIVE(flist->sorted[i]))
2807                                 break;
2808                 }
2809                 flist->high = i;
2810         }
2811 }
2812
2813 static void output_flist(struct file_list *flist)
2814 {
2815         char uidbuf[16], gidbuf[16], depthbuf[16];
2816         struct file_struct *file;
2817         const char *root, *dir, *slash, *name, *trail;
2818         const char *who = who_am_i();
2819         int i;
2820
2821         rprintf(FINFO, "[%s] flist start=%d, used=%d, low=%d, high=%d\n",
2822                 who, flist->ndx_start, flist->used, flist->low, flist->high);
2823         for (i = 0; i < flist->used; i++) {
2824                 file = flist->files[i];
2825                 if ((am_root || am_sender) && uid_ndx) {
2826                         snprintf(uidbuf, sizeof uidbuf, " uid=%u",
2827                                  F_OWNER(file));
2828                 } else
2829                         *uidbuf = '\0';
2830                 if (gid_ndx) {
2831                         static char parens[] = "(\0)\0\0\0";
2832                         char *pp = parens + (file->flags & FLAG_SKIP_GROUP ? 0 : 3);
2833                         snprintf(gidbuf, sizeof gidbuf, " gid=%s%u%s",
2834                                  pp, F_GROUP(file), pp + 2);
2835                 } else
2836                         *gidbuf = '\0';
2837                 if (!am_sender)
2838                         snprintf(depthbuf, sizeof depthbuf, "%d", F_DEPTH(file));
2839                 if (F_IS_ACTIVE(file)) {
2840                         root = am_sender ? NS(F_PATHNAME(file)) : depthbuf;
2841                         if ((dir = file->dirname) == NULL)
2842                                 dir = slash = "";
2843                         else
2844                                 slash = "/";
2845                         name = file->basename;
2846                         trail = S_ISDIR(file->mode) ? "/" : "";
2847                 } else
2848                         root = dir = slash = name = trail = "";
2849                 rprintf(FINFO,
2850                         "[%s] i=%d %s %s%s%s%s mode=0%o len=%s%s%s flags=%x\n",
2851                         who, i + flist->ndx_start,
2852                         root, dir, slash, name, trail,
2853                         (int)file->mode, comma_num(F_LENGTH(file)),
2854                         uidbuf, gidbuf, file->flags);
2855         }
2856 }
2857
2858 enum fnc_state { s_DIR, s_SLASH, s_BASE, s_TRAILING };
2859 enum fnc_type { t_PATH, t_ITEM };
2860
2861 static int found_prefix;
2862
2863 /* Compare the names of two file_struct entities, similar to how strcmp()
2864  * would do if it were operating on the joined strings.
2865  *
2866  * Some differences beginning with protocol_version 29: (1) directory names
2867  * are compared with an assumed trailing slash so that they compare in a
2868  * way that would cause them to sort immediately prior to any content they
2869  * may have; (2) a directory of any name compares after a non-directory of
2870  * any name at the same depth; (3) a directory with name "." compares prior
2871  * to anything else.  These changes mean that a directory and a non-dir
2872  * with the same name will not compare as equal (protocol_version >= 29).
2873  *
2874  * The dirname component can be an empty string, but the basename component
2875  * cannot (and never is in the current codebase).  The basename component
2876  * may be NULL (for a removed item), in which case it is considered to be
2877  * after any existing item. */
2878 int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
2879 {
2880         int dif;
2881         const uchar *c1, *c2;
2882         enum fnc_state state1, state2;
2883         enum fnc_type type1, type2;
2884         enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
2885
2886         if (!f1 || !F_IS_ACTIVE(f1)) {
2887                 if (!f2 || !F_IS_ACTIVE(f2))
2888                         return 0;
2889                 return -1;
2890         }
2891         if (!f2 || !F_IS_ACTIVE(f2))
2892                 return 1;
2893
2894         c1 = (uchar*)f1->dirname;
2895         c2 = (uchar*)f2->dirname;
2896         if (c1 == c2)
2897                 c1 = c2 = NULL;
2898         if (!c1) {
2899                 type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM;
2900                 c1 = (const uchar*)f1->basename;
2901                 if (type1 == t_PATH && *c1 == '.' && !c1[1]) {
2902                         type1 = t_ITEM;
2903                         state1 = s_TRAILING;
2904                         c1 = (uchar*)"";
2905                 } else
2906                         state1 = s_BASE;
2907         } else {
2908                 type1 = t_path;
2909                 state1 = s_DIR;
2910         }
2911         if (!c2) {
2912                 type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM;
2913                 c2 = (const uchar*)f2->basename;
2914                 if (type2 == t_PATH && *c2 == '.' && !c2[1]) {
2915                         type2 = t_ITEM;
2916                         state2 = s_TRAILING;
2917                         c2 = (uchar*)"";
2918                 } else
2919                         state2 = s_BASE;
2920         } else {
2921                 type2 = t_path;
2922                 state2 = s_DIR;
2923         }
2924
2925         if (type1 != type2)
2926                 return type1 == t_PATH ? 1 : -1;
2927
2928         do {
2929                 if (!*c1) {
2930                         switch (state1) {
2931                         case s_DIR:
2932                                 state1 = s_SLASH;
2933                                 c1 = (uchar*)"/";
2934                                 break;
2935                         case s_SLASH:
2936                                 type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM;
2937                                 c1 = (const uchar*)f1->basename;
2938                                 if (type1 == t_PATH && *c1 == '.' && !c1[1]) {
2939                                         type1 = t_ITEM;
2940                                         state1 = s_TRAILING;
2941                                         c1 = (uchar*)"";
2942                                 } else
2943                                         state1 = s_BASE;
2944                                 break;
2945                         case s_BASE:
2946                                 state1 = s_TRAILING;
2947                                 if (type1 == t_PATH) {
2948                                         c1 = (uchar*)"/";
2949                                         break;
2950                                 }
2951                                 /* FALL THROUGH */
2952                         case s_TRAILING:
2953                                 type1 = t_ITEM;
2954                                 break;
2955                         }
2956                         if (*c2 && type1 != type2)
2957                                 return type1 == t_PATH ? 1 : -1;
2958                 }
2959                 if (!*c2) {
2960                         switch (state2) {
2961                         case s_DIR:
2962                                 state2 = s_SLASH;
2963                                 c2 = (uchar*)"/";
2964                                 break;
2965                         case s_SLASH:
2966                                 type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM;
2967                                 c2 = (const uchar*)f2->basename;
2968                                 if (type2 == t_PATH && *c2 == '.' && !c2[1]) {
2969                                         type2 = t_ITEM;
2970                                         state2 = s_TRAILING;
2971                                         c2 = (uchar*)"";
2972                                 } else
2973                                         state2 = s_BASE;
2974                                 break;
2975                         case s_BASE:
2976                                 state2 = s_TRAILING;
2977                                 if (type2 == t_PATH) {
2978                                         c2 = (uchar*)"/";
2979                                         break;
2980                                 }
2981                                 /* FALL THROUGH */
2982                         case s_TRAILING:
2983                                 found_prefix = 1;
2984                                 if (!*c1)
2985                                         return 0;
2986                                 type2 = t_ITEM;
2987                                 break;
2988                         }
2989                         if (type1 != type2)
2990                                 return type1 == t_PATH ? 1 : -1;
2991                 }
2992         } while ((dif = (int)*c1++ - (int)*c2++) == 0);
2993
2994         return dif;
2995 }
2996
2997 /* Returns 1 if f1's filename has all of f2's filename as a prefix.  This does
2998  * not match if f2's basename is not an exact match of a path element in f1.
2999  * E.g. /path/foo is not a prefix of /path/foobar/baz, but /path/foobar is. */
3000 int f_name_has_prefix(const struct file_struct *f1, const struct file_struct *f2)
3001 {
3002         found_prefix = 0;
3003         f_name_cmp(f1, f2);
3004         return found_prefix;
3005 }
3006
3007 char *f_name_buf(void)
3008 {
3009         static char names[5][MAXPATHLEN];
3010         static unsigned int n;
3011
3012         n = (n + 1) % (sizeof names / sizeof names[0]);
3013
3014         return names[n];
3015 }
3016
3017 /* Return a copy of the full filename of a flist entry, using the indicated
3018  * buffer or one of 5 static buffers if fbuf is NULL.  No size-checking is
3019  * done because we checked the size when creating the file_struct entry.
3020  */
3021 char *f_name(const struct file_struct *f, char *fbuf)
3022 {
3023         if (!f || !F_IS_ACTIVE(f))
3024                 return NULL;
3025
3026         if (!fbuf)
3027                 fbuf = f_name_buf();
3028
3029         if (f->dirname) {
3030                 int len = strlen(f->dirname);
3031                 memcpy(fbuf, f->dirname, len);
3032                 fbuf[len] = '/';
3033                 strlcpy(fbuf + len + 1, f->basename, MAXPATHLEN - (len + 1));
3034         } else
3035                 strlcpy(fbuf, f->basename, MAXPATHLEN);
3036
3037         return fbuf;
3038 }
3039
3040 /* Do a non-recursive scan of the named directory, possibly ignoring all
3041  * exclude rules except for the daemon's.  If "dlen" is >=0, it is the length
3042  * of the dirname string, and also indicates that "dirname" is a MAXPATHLEN
3043  * buffer (the functions we call will append names onto the end, but the old
3044  * dir value will be restored on exit). */
3045 struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules)
3046 {
3047         struct file_list *dirlist;
3048         char dirbuf[MAXPATHLEN];
3049         int save_recurse = recurse;
3050         int save_xfer_dirs = xfer_dirs;
3051         int save_prune_empty_dirs = prune_empty_dirs;
3052
3053         if (dlen < 0) {
3054                 dlen = strlcpy(dirbuf, dirname, MAXPATHLEN);
3055                 if (dlen >= MAXPATHLEN)
3056                         return NULL;
3057                 dirname = dirbuf;
3058         }
3059
3060         dirlist = flist_new(FLIST_TEMP, "get_dirlist");
3061
3062         recurse = 0;
3063         xfer_dirs = 1;
3064         send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen, 0);
3065         xfer_dirs = save_xfer_dirs;
3066         recurse = save_recurse;
3067         if (INFO_GTE(PROGRESS, 1))
3068                 flist_count_offset += dirlist->used;
3069
3070         prune_empty_dirs = 0;
3071         dirlist->sorted = dirlist->files;
3072         flist_sort_and_clean(dirlist, 0);
3073         prune_empty_dirs = save_prune_empty_dirs;
3074
3075         if (DEBUG_GTE(FLIST, 3))
3076                 output_flist(dirlist);
3077
3078         return dirlist;
3079 }