flist.c

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