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