Commit | Line | Data |
---|---|---|
dbda5fbf | 1 | /* |
0f78b815 WD |
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> | |
ba2133d6 | 7 | * Copyright (C) 2002-2007 Wayne Davison |
0f78b815 WD |
8 | * |
9 | * This program is free software; you can redistribute it and/or modify | |
8e41b68e WD |
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. | |
736a6a29 | 13 | * |
0f78b815 WD |
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. | |
172875cf | 18 | * |
e7c67065 | 19 | * You should have received a copy of the GNU General Public License along |
4fd842f9 | 20 | * with this program; if not, visit the http://fsf.org website. |
0f78b815 | 21 | */ |
c627d613 AT |
22 | |
23 | #include "rsync.h" | |
a3e18c76 | 24 | #include "rounding.h" |
6d4e718f | 25 | #include "io.h" |
c627d613 AT |
26 | |
27 | extern int verbose; | |
34e18ecd | 28 | extern int list_only; |
f05f993e | 29 | extern int am_root; |
c627d613 | 30 | extern int am_server; |
a8726d2a | 31 | extern int am_daemon; |
56194bcd | 32 | extern int am_sender; |
f14b3ef4 | 33 | extern int am_generator; |
3ea6e0e7 | 34 | extern int inc_recurse; |
8715db2c | 35 | extern int do_progress; |
c627d613 | 36 | extern int always_checksum; |
983b1ed3 WD |
37 | extern int module_id; |
38 | extern int ignore_errors; | |
4836c3ee | 39 | extern int numeric_ids; |
a06d19e3 | 40 | extern int recurse; |
a572e126 | 41 | extern int use_qsort; |
7e037c42 | 42 | extern int xfer_dirs; |
24d0fcde | 43 | extern int filesfrom_fd; |
c627d613 | 44 | extern int one_file_system; |
88c2190a | 45 | extern int copy_dirlinks; |
314f4591 | 46 | extern int keep_dirlinks; |
1c3344a1 | 47 | extern int preserve_acls; |
16edf865 | 48 | extern int preserve_xattrs; |
c627d613 | 49 | extern int preserve_links; |
dc5ddbcc | 50 | extern int preserve_hard_links; |
c627d613 | 51 | extern int preserve_devices; |
b5c6a6ae | 52 | extern int preserve_specials; |
9b25ef35 WD |
53 | extern int uid_ndx; |
54 | extern int gid_ndx; | |
6574b4f7 | 55 | extern int relative_paths; |
24d0fcde | 56 | extern int implied_dirs; |
99a957d3 | 57 | extern int file_extra_cnt; |
53039410 WD |
58 | extern int ignore_perishable; |
59 | extern int non_perishable_cnt; | |
85aecef6 | 60 | extern int prune_empty_dirs; |
82306bf6 | 61 | extern int copy_links; |
b5313607 | 62 | extern int copy_unsafe_links; |
d04e9c51 | 63 | extern int protocol_version; |
cb13abfe | 64 | extern int sanitize_paths; |
d64e6f42 | 65 | extern struct stats stats; |
c627d613 | 66 | |
e1f40891 WD |
67 | extern char curr_dir[MAXPATHLEN]; |
68 | ||
2b7e0f33 WD |
69 | extern struct chmod_mode_struct *chmod_modes; |
70 | ||
7842418b WD |
71 | extern struct filter_list_struct filter_list; |
72 | extern struct filter_list_struct server_filter_list; | |
c627d613 | 73 | |
332cf6df WD |
74 | #ifdef ICONV_OPTION |
75 | extern int ic_ndx; | |
76 | extern int need_unsorted_flist; | |
77 | extern iconv_t ic_send, ic_recv; | |
78 | #endif | |
79 | ||
a572e126 WD |
80 | #define PTR_SIZE (sizeof (struct file_struct *)) |
81 | ||
06c28400 | 82 | int io_error; |
7752df41 | 83 | int checksum_len; |
535737bf | 84 | dev_t filesystem_dev; /* used to implement -x */ |
82ad07c4 | 85 | |
c7e6f84f WD |
86 | struct file_list *cur_flist, *first_flist, *dir_flist; |
87 | int send_dir_ndx = -1, send_dir_depth = 0; | |
88 | int flist_cnt = 0; /* how many (non-tmp) file list objects exist */ | |
89 | int file_total = 0; /* total of all active items over all file-lists */ | |
90 | int flist_eof = 0; /* all the file-lists are now known */ | |
91 | ||
82ad07c4 WD |
92 | /* The tmp_* vars are used as a cache area by make_file() to store data |
93 | * that the sender doesn't need to remember in its file list. The data | |
94 | * will survive just long enough to be used by send_file_entry(). */ | |
95 | static dev_t tmp_rdev; | |
9d155ecd | 96 | #ifdef SUPPORT_HARD_LINKS |
9d737ecb | 97 | static int64 tmp_dev, tmp_ino; |
9d155ecd | 98 | #endif |
a0456b9c | 99 | static char tmp_sum[MAX_DIGEST_LEN]; |
06c28400 | 100 | |
a0456b9c | 101 | static char empty_sum[MAX_DIGEST_LEN]; |
c7565dad | 102 | static int flist_count_offset; /* for --delete --progress */ |
8ea07c00 | 103 | static int dir_count = 0; |
3d382777 | 104 | |
a6e7b978 | 105 | static void clean_flist(struct file_list *flist, int strip_root); |
32cbfe7b | 106 | static void output_flist(struct file_list *flist); |
0199b05f | 107 | |
61dec11a WD |
108 | void init_flist(void) |
109 | { | |
96293cf9 WD |
110 | if (verbose > 4) { |
111 | rprintf(FINFO, "FILE_STRUCT_LEN=%d, EXTRA_LEN=%d\n", | |
6aef83c9 | 112 | (int)FILE_STRUCT_LEN, (int)EXTRA_LEN); |
96293cf9 | 113 | } |
a0456b9c WD |
114 | checksum_len = protocol_version < 21 ? 2 |
115 | : protocol_version < 30 ? MD4_DIGEST_LEN | |
116 | : MD5_DIGEST_LEN; | |
61dec11a WD |
117 | } |
118 | ||
1bbd10fe | 119 | static int show_filelist_p(void) |
58225000 | 120 | { |
3ea6e0e7 | 121 | return verbose && xfer_dirs && !am_server && !inc_recurse; |
1bbd10fe | 122 | } |
ebed4c3a | 123 | |
1bbd10fe DD |
124 | static void start_filelist_progress(char *kind) |
125 | { | |
ea124cb3 | 126 | rprintf(FCLIENT, "%s ... ", kind); |
e5ce3bcf | 127 | if (verbose > 1 || do_progress) |
ea124cb3 | 128 | rprintf(FCLIENT, "\n"); |
1bbd10fe | 129 | rflush(FINFO); |
58225000 MP |
130 | } |
131 | ||
53135fe8 | 132 | static void emit_filelist_progress(int count) |
db719fb0 | 133 | { |
ea124cb3 | 134 | rprintf(FCLIENT, " %d files...\r", count); |
db719fb0 MP |
135 | } |
136 | ||
53135fe8 | 137 | static void maybe_emit_filelist_progress(int count) |
58225000 | 138 | { |
53135fe8 WD |
139 | if (do_progress && show_filelist_p() && (count % 100) == 0) |
140 | emit_filelist_progress(count); | |
58225000 MP |
141 | } |
142 | ||
1bbd10fe | 143 | static void finish_filelist_progress(const struct file_list *flist) |
58225000 | 144 | { |
1bbd10fe DD |
145 | if (do_progress) { |
146 | /* This overwrites the progress line */ | |
c7b562be | 147 | rprintf(FINFO, "%d file%sto consider\n", |
9decb4d2 | 148 | flist->used, flist->used == 1 ? " " : "s "); |
b7736c79 | 149 | } else |
1bbd10fe | 150 | rprintf(FINFO, "done\n"); |
58225000 MP |
151 | } |
152 | ||
86943126 MP |
153 | void show_flist_stats(void) |
154 | { | |
155 | /* Nothing yet */ | |
156 | } | |
157 | ||
f7632fc6 AT |
158 | static void list_file_entry(struct file_struct *f) |
159 | { | |
78d146e8 | 160 | char permbuf[PERMSTRING_SIZE]; |
96293cf9 | 161 | double len; |
f7632fc6 | 162 | |
96293cf9 | 163 | if (!F_IS_ACTIVE(f)) { |
7212be92 DD |
164 | /* this can happen if duplicate names were removed */ |
165 | return; | |
e5ce3bcf | 166 | } |
7212be92 | 167 | |
78d146e8 | 168 | permstring(permbuf, f->mode); |
96293cf9 | 169 | len = F_LENGTH(f); |
740819ef | 170 | |
1c3344a1 WD |
171 | /* TODO: indicate '+' if the entry has an ACL. */ |
172 | ||
4f5b0756 | 173 | #ifdef SUPPORT_LINKS |
f7632fc6 | 174 | if (preserve_links && S_ISLNK(f->mode)) { |
ebed4c3a | 175 | rprintf(FINFO, "%s %11.0f %s %s -> %s\n", |
96293cf9 | 176 | permbuf, len, timestring(f->modtime), |
82ad07c4 | 177 | f_name(f, NULL), F_SYMLINK(f)); |
0d162bd1 WD |
178 | } else |
179 | #endif | |
e5ce3bcf | 180 | { |
ebed4c3a | 181 | rprintf(FINFO, "%s %11.0f %s %s\n", |
96293cf9 | 182 | permbuf, len, timestring(f->modtime), |
5e4ff5f9 | 183 | f_name(f, NULL)); |
e5ce3bcf | 184 | } |
f7632fc6 AT |
185 | } |
186 | ||
cad8f6f9 WD |
187 | /* Stat either a symlink or its referent, depending on the settings of |
188 | * copy_links, copy_unsafe_links, etc. Returns -1 on error, 0 on success. | |
4e5db0ad | 189 | * |
cad8f6f9 WD |
190 | * If path is the name of a symlink, then the linkbuf buffer (which must hold |
191 | * MAXPATHLEN chars) will be set to the symlink's target string. | |
4e5db0ad | 192 | * |
cad8f6f9 WD |
193 | * The stat structure pointed to by stp will contain information about the |
194 | * link or the referent as appropriate, if they exist. */ | |
195 | static int readlink_stat(const char *path, STRUCT_STAT *stp, char *linkbuf) | |
b5313607 | 196 | { |
4f5b0756 | 197 | #ifdef SUPPORT_LINKS |
cad8f6f9 | 198 | if (link_stat(path, stp, copy_dirlinks) < 0) |
b5313607 | 199 | return -1; |
cad8f6f9 WD |
200 | if (S_ISLNK(stp->st_mode)) { |
201 | int llen = readlink(path, linkbuf, MAXPATHLEN - 1); | |
202 | if (llen < 0) | |
b5313607 | 203 | return -1; |
cad8f6f9 | 204 | linkbuf[llen] = '\0'; |
fc638474 DD |
205 | if (copy_unsafe_links && unsafe_symlink(linkbuf, path)) { |
206 | if (verbose > 1) { | |
dbda5fbf | 207 | rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n", |
0ee6ca98 | 208 | path, linkbuf); |
fc638474 | 209 | } |
9439c0cb | 210 | return x_stat(path, stp, NULL); |
b5313607 DD |
211 | } |
212 | } | |
213 | return 0; | |
214 | #else | |
9439c0cb | 215 | return x_stat(path, stp, NULL); |
b5313607 DD |
216 | #endif |
217 | } | |
218 | ||
cad8f6f9 | 219 | int link_stat(const char *path, STRUCT_STAT *stp, int follow_dirlinks) |
82306bf6 | 220 | { |
4f5b0756 | 221 | #ifdef SUPPORT_LINKS |
b7736c79 | 222 | if (copy_links) |
9439c0cb WD |
223 | return x_stat(path, stp, NULL); |
224 | if (x_lstat(path, stp, NULL) < 0) | |
314f4591 | 225 | return -1; |
cad8f6f9 | 226 | if (follow_dirlinks && S_ISLNK(stp->st_mode)) { |
314f4591 | 227 | STRUCT_STAT st; |
9439c0cb | 228 | if (x_stat(path, &st, NULL) == 0 && S_ISDIR(st.st_mode)) |
cad8f6f9 | 229 | *stp = st; |
314f4591 WD |
230 | } |
231 | return 0; | |
82306bf6 | 232 | #else |
9439c0cb | 233 | return x_stat(path, stp, NULL); |
82306bf6 AT |
234 | #endif |
235 | } | |
236 | ||
7842418b | 237 | /* This function is used to check if a file should be included/excluded |
429f9828 | 238 | * from the list of files based on its name and type etc. The value of |
7842418b WD |
239 | * filter_level is set to either SERVER_FILTERS or ALL_FILTERS. */ |
240 | static int is_excluded(char *fname, int is_dir, int filter_level) | |
c627d613 | 241 | { |
7d687932 | 242 | #if 0 /* This currently never happens, so avoid a useless compare. */ |
7842418b | 243 | if (filter_level == NO_FILTERS) |
429f9828 WD |
244 | return 0; |
245 | #endif | |
6931c138 | 246 | if (fname) { |
429f9828 | 247 | /* never exclude '.', even if somebody does --exclude '*' */ |
6931c138 WD |
248 | if (fname[0] == '.' && !fname[1]) |
249 | return 0; | |
250 | /* Handle the -R version of the '.' dir. */ | |
251 | if (fname[0] == '/') { | |
252 | int len = strlen(fname); | |
253 | if (fname[len-1] == '.' && fname[len-2] == '/') | |
254 | return 0; | |
255 | } | |
76e26e10 | 256 | } |
7842418b WD |
257 | if (server_filter_list.head |
258 | && check_filter(&server_filter_list, fname, is_dir) < 0) | |
429f9828 | 259 | return 1; |
7842418b | 260 | if (filter_level != ALL_FILTERS) |
429f9828 | 261 | return 0; |
7842418b WD |
262 | if (filter_list.head |
263 | && check_filter(&filter_list, fname, is_dir) < 0) | |
76e26e10 | 264 | return 1; |
76e26e10 | 265 | return 0; |
c627d613 AT |
266 | } |
267 | ||
a6e7b978 | 268 | static void send_directory(int f, struct file_list *flist, |
c7e6f84f | 269 | char *fbuf, int len, int flags); |
c627d613 | 270 | |
ef35abb2 WD |
271 | static const char *pathname, *orig_dir; |
272 | static int pathname_len; | |
c627d613 | 273 | |
3ec4dd97 | 274 | |
9decb4d2 | 275 | /* Make sure flist can hold at least flist->used + extra entries. */ |
8ea07c00 | 276 | static void flist_expand(struct file_list *flist, int extra) |
d9d6bc52 | 277 | { |
0501f363 | 278 | struct file_struct **new_ptr; |
2e7d1994 | 279 | |
9decb4d2 | 280 | if (flist->used + extra <= flist->malloced) |
a85906c7 | 281 | return; |
dbda5fbf | 282 | |
a85906c7 S |
283 | if (flist->malloced < FLIST_START) |
284 | flist->malloced = FLIST_START; | |
285 | else if (flist->malloced >= FLIST_LINEAR) | |
286 | flist->malloced += FLIST_LINEAR; | |
287 | else | |
288 | flist->malloced *= 2; | |
289 | ||
a6e7b978 WD |
290 | /* In case count jumped or we are starting the list |
291 | * with a known size just set it. */ | |
9decb4d2 WD |
292 | if (flist->malloced < flist->used + extra) |
293 | flist->malloced = flist->used + extra; | |
a6e7b978 | 294 | |
0501f363 WD |
295 | new_ptr = realloc_array(flist->files, struct file_struct *, |
296 | flist->malloced); | |
2e7d1994 | 297 | |
8c483820 | 298 | if (verbose >= 2 && flist->malloced != FLIST_START) { |
83f53948 | 299 | rprintf(FCLIENT, "[%s] expand file_list pointer array to %.0f bytes, did%s move\n", |
a85906c7 | 300 | who_am_i(), |
a4a7e64c | 301 | (double)sizeof flist->files[0] * flist->malloced, |
a85906c7 | 302 | (new_ptr == flist->files) ? " not" : ""); |
d9d6bc52 | 303 | } |
a85906c7 | 304 | |
0501f363 | 305 | flist->files = new_ptr; |
a85906c7 S |
306 | |
307 | if (!flist->files) | |
308 | out_of_memory("flist_expand"); | |
d9d6bc52 MP |
309 | } |
310 | ||
abdcb21a WD |
311 | static void flist_done_allocating(struct file_list *flist) |
312 | { | |
313 | void *ptr = pool_boundary(flist->file_pool, 8*1024); | |
314 | if (flist->pool_boundary == ptr) | |
315 | flist->pool_boundary = NULL; /* list didn't use any pool memory */ | |
316 | else | |
317 | flist->pool_boundary = ptr; | |
318 | } | |
319 | ||
ef35abb2 | 320 | int push_pathname(const char *dir, int len) |
c7e6f84f | 321 | { |
ef35abb2 | 322 | if (dir == pathname) |
c7e6f84f WD |
323 | return 1; |
324 | ||
325 | if (!orig_dir) | |
326 | orig_dir = strdup(curr_dir); | |
327 | ||
ef35abb2 | 328 | if (pathname && !pop_dir(orig_dir)) { |
c7e6f84f WD |
329 | rsyserr(FERROR, errno, "pop_dir %s failed", |
330 | full_fname(orig_dir)); | |
331 | exit_cleanup(RERR_FILESELECT); | |
332 | } | |
333 | ||
334 | if (dir && !push_dir(dir, 0)) { | |
335 | io_error |= IOERR_GENERAL; | |
63d83e94 WD |
336 | rsyserr(FERROR, errno, "push_dir %s failed in %s", |
337 | full_fname(dir), curr_dir); | |
c7e6f84f WD |
338 | return 0; |
339 | } | |
340 | ||
ef35abb2 WD |
341 | pathname = dir; |
342 | pathname_len = len >= 0 ? len : dir ? (int)strlen(dir) : 0; | |
c7e6f84f WD |
343 | |
344 | return 1; | |
345 | } | |
346 | ||
42c6b139 | 347 | static void send_file_entry(int f, struct file_struct *file, int ndx) |
c627d613 | 348 | { |
5911fee5 WD |
349 | static time_t modtime; |
350 | static mode_t mode; | |
1490812a | 351 | static int64 dev; |
4124540d | 352 | static dev_t rdev; |
9c5e91f8 | 353 | static uint32 rdev_major; |
5911fee5 WD |
354 | static uid_t uid; |
355 | static gid_t gid; | |
c7e6f84f | 356 | static char *user_name, *group_name; |
5911fee5 | 357 | static char lastname[MAXPATHLEN]; |
f376e674 | 358 | char fname[MAXPATHLEN]; |
8cae71eb | 359 | int first_hlink_ndx = -1; |
ebed4c3a | 360 | int l1, l2; |
61cb031c | 361 | int xflags; |
72914a60 | 362 | |
332cf6df WD |
363 | #ifdef ICONV_OPTION |
364 | if (ic_send != (iconv_t)-1) { | |
365 | ICONV_CONST char *ibuf; | |
366 | char *obuf = fname; | |
367 | size_t ocnt = MAXPATHLEN, icnt; | |
368 | ||
369 | iconv(ic_send, NULL,0, NULL,0); | |
370 | if ((ibuf = (ICONV_CONST char *)file->dirname) != NULL) { | |
371 | icnt = strlen(ibuf); | |
372 | ocnt--; /* pre-subtract the space for the '/' */ | |
373 | if (iconv(ic_send, &ibuf,&icnt, &obuf,&ocnt) == (size_t)-1) | |
374 | goto convert_error; | |
375 | *obuf++ = '/'; | |
376 | } | |
377 | ||
378 | ibuf = (ICONV_CONST char *)file->basename; | |
379 | icnt = strlen(ibuf); | |
380 | if (iconv(ic_send, &ibuf,&icnt, &obuf,&ocnt) == (size_t)-1) { | |
381 | convert_error: | |
382 | io_error |= IOERR_GENERAL; | |
383 | rprintf(FINFO, | |
384 | "[%s] cannot convert filename: %s (%s)\n", | |
385 | who_am_i(), f_name(file, fname), strerror(errno)); | |
386 | return; | |
387 | } | |
388 | *obuf = '\0'; | |
389 | } else | |
390 | #endif | |
391 | f_name(file, fname); | |
72914a60 | 392 | |
61cb031c | 393 | xflags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */ |
72914a60 | 394 | |
30f337c9 | 395 | if (file->mode == mode) |
61cb031c | 396 | xflags |= XMIT_SAME_MODE; |
1ef00d20 | 397 | else |
30f337c9 | 398 | mode = file->mode; |
75f162e4 WD |
399 | |
400 | if (protocol_version >= 30 && S_ISDIR(mode) && !(file->flags & FLAG_XFER_DIR)) | |
401 | xflags |= XMIT_NON_XFER_DIR; | |
402 | ||
b5c6a6ae WD |
403 | if ((preserve_devices && IS_DEVICE(mode)) |
404 | || (preserve_specials && IS_SPECIAL(mode))) { | |
75bc8600 | 405 | if (protocol_version < 28) { |
82ad07c4 | 406 | if (tmp_rdev == rdev) |
61cb031c | 407 | xflags |= XMIT_SAME_RDEV_pre28; |
b5c6a6ae | 408 | else |
82ad07c4 | 409 | rdev = tmp_rdev; |
b5c6a6ae | 410 | } else { |
82ad07c4 | 411 | rdev = tmp_rdev; |
9c5e91f8 | 412 | if ((uint32)major(rdev) == rdev_major) |
61cb031c | 413 | xflags |= XMIT_SAME_RDEV_MAJOR; |
84a3efa0 | 414 | else |
9c5e91f8 | 415 | rdev_major = major(rdev); |
18438f0b | 416 | if (protocol_version < 30 && (uint32)minor(rdev) <= 0xFFu) |
61cb031c | 417 | xflags |= XMIT_RDEV_MINOR_8_pre30; |
75bc8600 | 418 | } |
b5c6a6ae | 419 | } else if (protocol_version < 28) |
b4a09b72 | 420 | rdev = MAKEDEV(0, 0); |
9b25ef35 | 421 | if (uid_ndx) { |
858d45f1 | 422 | if ((uid_t)F_OWNER(file) == uid && *lastname) |
61cb031c | 423 | xflags |= XMIT_SAME_UID; |
c7e6f84f | 424 | else { |
1564cd5a | 425 | uid = F_OWNER(file); |
9b25ef35 | 426 | if (uid_ndx && !numeric_ids) { |
c7e6f84f | 427 | user_name = add_uid(uid); |
3ea6e0e7 | 428 | if (inc_recurse && user_name) |
61cb031c | 429 | xflags |= XMIT_USER_NAME_FOLLOWS; |
c7e6f84f WD |
430 | } |
431 | } | |
82ad07c4 | 432 | } |
9b25ef35 | 433 | if (gid_ndx) { |
858d45f1 | 434 | if ((gid_t)F_GROUP(file) == gid && *lastname) |
61cb031c | 435 | xflags |= XMIT_SAME_GID; |
c7e6f84f | 436 | else { |
1564cd5a | 437 | gid = F_GROUP(file); |
9b25ef35 | 438 | if (gid_ndx && !numeric_ids) { |
c7e6f84f | 439 | group_name = add_gid(gid); |
3ea6e0e7 | 440 | if (inc_recurse && group_name) |
61cb031c | 441 | xflags |= XMIT_GROUP_NAME_FOLLOWS; |
c7e6f84f WD |
442 | } |
443 | } | |
82ad07c4 | 444 | } |
30f337c9 | 445 | if (file->modtime == modtime) |
61cb031c | 446 | xflags |= XMIT_SAME_TIME; |
1ef00d20 | 447 | else |
30f337c9 | 448 | modtime = file->modtime; |
a289addd | 449 | |
4f5b0756 | 450 | #ifdef SUPPORT_HARD_LINKS |
9d737ecb | 451 | if (tmp_dev != 0) { |
8cae71eb | 452 | if (protocol_version >= 30) { |
9d737ecb | 453 | struct idev_node *np = idev_node(tmp_dev, tmp_ino); |
424d3691 | 454 | first_hlink_ndx = (int32)(long)np->data - 1; |
8cae71eb | 455 | if (first_hlink_ndx < 0) { |
424d3691 | 456 | np->data = (void*)(long)(ndx + 1); |
61cb031c | 457 | xflags |= XMIT_HLINK_FIRST; |
8cae71eb | 458 | } |
61cb031c | 459 | xflags |= XMIT_HLINKED; |
8cae71eb | 460 | } else { |
9d737ecb | 461 | if (tmp_dev == dev) { |
8cae71eb | 462 | if (protocol_version >= 28) |
61cb031c | 463 | xflags |= XMIT_SAME_DEV_pre30; |
8cae71eb | 464 | } else |
9d737ecb | 465 | dev = tmp_dev; |
61cb031c | 466 | xflags |= XMIT_HLINKED; |
8cae71eb | 467 | } |
c4b4df4f | 468 | } |
0d162bd1 | 469 | #endif |
ebed4c3a MP |
470 | |
471 | for (l1 = 0; | |
3e491682 S |
472 | lastname[l1] && (fname[l1] == lastname[l1]) && (l1 < 255); |
473 | l1++) {} | |
eddd5d12 | 474 | l2 = strlen(fname+l1); |
72914a60 | 475 | |
ebed4c3a | 476 | if (l1 > 0) |
61cb031c | 477 | xflags |= XMIT_SAME_NAME; |
ebed4c3a | 478 | if (l2 > 255) |
61cb031c | 479 | xflags |= XMIT_LONG_NAME; |
72914a60 | 480 | |
1aa4caf3 WD |
481 | /* We must make sure we don't send a zero flag byte or the |
482 | * other end will terminate the flist transfer. Note that | |
ee3751c8 | 483 | * the use of XMIT_TOP_DIR on a non-dir has no meaning, so |
1aa4caf3 | 484 | * it's harmless way to add a bit to the first flag byte. */ |
75bc8600 | 485 | if (protocol_version >= 28) { |
61cb031c WD |
486 | if (!xflags && !S_ISDIR(mode)) |
487 | xflags |= XMIT_TOP_DIR; | |
488 | if ((xflags & 0xFF00) || !xflags) { | |
489 | xflags |= XMIT_EXTENDED_FLAGS; | |
490 | write_shortint(f, xflags); | |
75bc8600 | 491 | } else |
61cb031c | 492 | write_byte(f, xflags); |
75bc8600 | 493 | } else { |
61cb031c WD |
494 | if (!(xflags & 0xFF)) |
495 | xflags |= S_ISDIR(mode) ? XMIT_LONG_NAME : XMIT_TOP_DIR; | |
496 | write_byte(f, xflags); | |
75bc8600 | 497 | } |
61cb031c | 498 | if (xflags & XMIT_SAME_NAME) |
ebed4c3a | 499 | write_byte(f, l1); |
61cb031c | 500 | if (xflags & XMIT_LONG_NAME) |
f31514ad | 501 | write_varint30(f, l2); |
72914a60 | 502 | else |
ebed4c3a MP |
503 | write_byte(f, l2); |
504 | write_buf(f, fname + l1, l2); | |
72914a60 | 505 | |
8cae71eb | 506 | if (first_hlink_ndx >= 0) { |
f31514ad | 507 | write_varint30(f, first_hlink_ndx); |
8cae71eb WD |
508 | goto the_end; |
509 | } | |
510 | ||
ba59bd68 | 511 | write_varlong30(f, F_LENGTH(file), 3); |
61cb031c | 512 | if (!(xflags & XMIT_SAME_TIME)) { |
ba59bd68 WD |
513 | if (protocol_version >= 30) |
514 | write_varlong(f, modtime, 4); | |
515 | else | |
516 | write_int(f, modtime); | |
517 | } | |
61cb031c | 518 | if (!(xflags & XMIT_SAME_MODE)) |
30f337c9 | 519 | write_int(f, to_wire_mode(mode)); |
61cb031c | 520 | if (uid_ndx && !(xflags & XMIT_SAME_UID)) { |
18438f0b WD |
521 | if (protocol_version < 30) |
522 | write_int(f, uid); | |
523 | else { | |
f31514ad | 524 | write_varint(f, uid); |
61cb031c | 525 | if (xflags & XMIT_USER_NAME_FOLLOWS) { |
18438f0b WD |
526 | int len = strlen(user_name); |
527 | write_byte(f, len); | |
528 | write_buf(f, user_name, len); | |
529 | } | |
c7e6f84f | 530 | } |
72914a60 | 531 | } |
61cb031c | 532 | if (gid_ndx && !(xflags & XMIT_SAME_GID)) { |
18438f0b WD |
533 | if (protocol_version < 30) |
534 | write_int(f, gid); | |
535 | else { | |
f31514ad | 536 | write_varint(f, gid); |
61cb031c | 537 | if (xflags & XMIT_GROUP_NAME_FOLLOWS) { |
18438f0b WD |
538 | int len = strlen(group_name); |
539 | write_byte(f, len); | |
540 | write_buf(f, group_name, len); | |
541 | } | |
c7e6f84f | 542 | } |
72914a60 | 543 | } |
b5c6a6ae WD |
544 | if ((preserve_devices && IS_DEVICE(mode)) |
545 | || (preserve_specials && IS_SPECIAL(mode))) { | |
9c5e91f8 | 546 | if (protocol_version < 28) { |
61cb031c | 547 | if (!(xflags & XMIT_SAME_RDEV_pre28)) |
9c5e91f8 WD |
548 | write_int(f, (int)rdev); |
549 | } else { | |
61cb031c | 550 | if (!(xflags & XMIT_SAME_RDEV_MAJOR)) |
f31514ad | 551 | write_varint30(f, major(rdev)); |
18438f0b | 552 | if (protocol_version >= 30) |
f31514ad | 553 | write_varint(f, minor(rdev)); |
61cb031c | 554 | else if (xflags & XMIT_RDEV_MINOR_8_pre30) |
9c5e91f8 WD |
555 | write_byte(f, minor(rdev)); |
556 | else | |
557 | write_int(f, minor(rdev)); | |
558 | } | |
75bc8600 | 559 | } |
c627d613 | 560 | |
4f5b0756 | 561 | #ifdef SUPPORT_LINKS |
30f337c9 | 562 | if (preserve_links && S_ISLNK(mode)) { |
82ad07c4 WD |
563 | const char *sl = F_SYMLINK(file); |
564 | int len = strlen(sl); | |
f31514ad | 565 | write_varint30(f, len); |
82ad07c4 | 566 | write_buf(f, sl, len); |
72914a60 | 567 | } |
c627d613 AT |
568 | #endif |
569 | ||
4f5b0756 | 570 | #ifdef SUPPORT_HARD_LINKS |
9d737ecb | 571 | if (tmp_dev != 0 && protocol_version < 30) { |
4124540d | 572 | if (protocol_version < 26) { |
736a6a29 | 573 | /* 32-bit dev_t and ino_t */ |
26404276 | 574 | write_int(f, (int32)dev); |
9d737ecb | 575 | write_int(f, (int32)tmp_ino); |
736a6a29 MP |
576 | } else { |
577 | /* 64-bit dev_t and ino_t */ | |
61cb031c | 578 | if (!(xflags & XMIT_SAME_DEV_pre30)) |
4124540d | 579 | write_longint(f, dev); |
9d737ecb | 580 | write_longint(f, tmp_ino); |
736a6a29 | 581 | } |
72914a60 | 582 | } |
dc5ddbcc AT |
583 | #endif |
584 | ||
9a4a237e | 585 | if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) { |
4a19c3b2 | 586 | const char *sum; |
728d0922 | 587 | if (S_ISREG(mode)) |
82ad07c4 | 588 | sum = tmp_sum; |
9a4a237e | 589 | else { |
728d0922 WD |
590 | /* Prior to 28, we sent a useless set of nulls. */ |
591 | sum = empty_sum; | |
728d0922 | 592 | } |
7752df41 | 593 | write_buf(f, sum, checksum_len); |
ebed4c3a | 594 | } |
182dca5c | 595 | |
8cae71eb | 596 | the_end: |
ebed4c3a | 597 | strlcpy(lastname, fname, MAXPATHLEN); |
ca947dea WD |
598 | |
599 | if (S_ISREG(mode) || S_ISLNK(mode)) | |
600 | stats.total_size += F_LENGTH(file); | |
182dca5c AT |
601 | } |
602 | ||
82ad07c4 | 603 | static struct file_struct *recv_file_entry(struct file_list *flist, |
1564cd5a | 604 | int xflags, int f) |
182dca5c | 605 | { |
f14b3ef4 | 606 | static int64 modtime; |
5911fee5 | 607 | static mode_t mode; |
1490812a | 608 | static int64 dev; |
4124540d | 609 | static dev_t rdev; |
9c5e91f8 | 610 | static uint32 rdev_major; |
5911fee5 WD |
611 | static uid_t uid; |
612 | static gid_t gid; | |
cf1b4969 | 613 | static uint16 gid_flags; |
a289addd | 614 | static char lastname[MAXPATHLEN], *lastdir; |
33ffd7c3 | 615 | static int lastdir_depth, lastdir_len = -1; |
42f23f47 | 616 | static unsigned int del_hier_name_len = 0; |
649f8742 | 617 | static int in_del_hier = 0; |
72914a60 | 618 | char thisname[MAXPATHLEN]; |
ebed4c3a | 619 | unsigned int l1 = 0, l2 = 0; |
c7e6f84f | 620 | int alloc_len, basename_len, linkname_len; |
99a957d3 | 621 | int extra_len = file_extra_cnt * EXTRA_LEN; |
8cae71eb | 622 | int first_hlink_ndx = -1; |
a289addd | 623 | OFF_T file_length; |
c7e6f84f | 624 | const char *basename; |
72914a60 | 625 | struct file_struct *file; |
ef35abb2 WD |
626 | alloc_pool_t *pool; |
627 | char *bp; | |
72914a60 | 628 | |
1564cd5a | 629 | if (xflags & XMIT_SAME_NAME) |
72914a60 | 630 | l1 = read_byte(f); |
ebed4c3a | 631 | |
1564cd5a | 632 | if (xflags & XMIT_LONG_NAME) |
f31514ad | 633 | l2 = read_varint30(f); |
72914a60 AT |
634 | else |
635 | l2 = read_byte(f); | |
636 | ||
ebed4c3a MP |
637 | if (l2 >= MAXPATHLEN - l1) { |
638 | rprintf(FERROR, | |
1564cd5a WD |
639 | "overflow: xflags=0x%x l1=%d l2=%d lastname=%s [%s]\n", |
640 | xflags, l1, l2, lastname, who_am_i()); | |
82ad07c4 | 641 | overflow_exit("recv_file_entry"); |
d0fd26aa | 642 | } |
72914a60 | 643 | |
ebed4c3a MP |
644 | strlcpy(thisname, lastname, l1 + 1); |
645 | read_sbuf(f, &thisname[l1], l2); | |
646 | thisname[l1 + l2] = 0; | |
72914a60 | 647 | |
332cf6df WD |
648 | /* Abuse basename_len for a moment... */ |
649 | basename_len = strlcpy(lastname, thisname, MAXPATHLEN); | |
650 | ||
651 | #ifdef ICONV_OPTION | |
652 | if (ic_recv != (iconv_t)-1) { | |
58a37ed3 WD |
653 | char *obuf = thisname; |
654 | ICONV_CONST char *ibuf = (ICONV_CONST char *)lastname; | |
332cf6df WD |
655 | size_t ocnt = MAXPATHLEN, icnt = basename_len; |
656 | ||
657 | if (icnt >= MAXPATHLEN) { | |
658 | errno = E2BIG; | |
659 | goto convert_error; | |
660 | } | |
661 | ||
662 | iconv(ic_recv, NULL,0, NULL,0); | |
663 | if (iconv(ic_recv, &ibuf,&icnt, &obuf,&ocnt) == (size_t)-1) { | |
664 | convert_error: | |
665 | io_error |= IOERR_GENERAL; | |
666 | rprintf(FINFO, | |
667 | "[%s] cannot convert filename: %s (%s)\n", | |
668 | who_am_i(), lastname, strerror(errno)); | |
669 | obuf = thisname; | |
670 | } | |
671 | *obuf = '\0'; | |
672 | } | |
673 | #endif | |
72914a60 | 674 | |
58b1999e | 675 | clean_fname(thisname, 0); |
72914a60 | 676 | |
0d162bd1 | 677 | if (sanitize_paths) |
a2248aea | 678 | sanitize_path(thisname, thisname, "", 0, NULL); |
cb13abfe | 679 | |
a289addd | 680 | if ((basename = strrchr(thisname, '/')) != NULL) { |
c7e6f84f WD |
681 | int len = basename++ - thisname; |
682 | if (len != lastdir_len || memcmp(thisname, lastdir, len) != 0) { | |
683 | lastdir = new_array(char, len + 1); | |
684 | memcpy(lastdir, thisname, len); | |
685 | lastdir[len] = '\0'; | |
686 | lastdir_len = len; | |
687 | lastdir_depth = count_dir_elements(lastdir); | |
688 | } | |
689 | } else | |
a289addd | 690 | basename = thisname; |
a289addd | 691 | basename_len = strlen(basename) + 1; /* count the '\0' */ |
72914a60 | 692 | |
8cae71eb WD |
693 | #ifdef SUPPORT_HARD_LINKS |
694 | if (protocol_version >= 30 | |
1564cd5a | 695 | && BITS_SETnUNSET(xflags, XMIT_HLINKED, XMIT_HLINK_FIRST)) { |
8cae71eb | 696 | struct file_struct *first; |
f31514ad | 697 | first_hlink_ndx = read_varint30(f); |
9decb4d2 | 698 | if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->used) { |
8cae71eb WD |
699 | rprintf(FERROR, |
700 | "hard-link reference out of range: %d (%d)\n", | |
9decb4d2 | 701 | first_hlink_ndx, flist->used); |
8cae71eb WD |
702 | exit_cleanup(RERR_PROTOCOL); |
703 | } | |
704 | first = flist->files[first_hlink_ndx]; | |
705 | file_length = F_LENGTH(first); | |
706 | modtime = first->modtime; | |
707 | mode = first->mode; | |
9b25ef35 | 708 | if (uid_ndx) |
1564cd5a | 709 | uid = F_OWNER(first); |
9b25ef35 | 710 | if (gid_ndx) |
1564cd5a | 711 | gid = F_GROUP(first); |
8cae71eb WD |
712 | if ((preserve_devices && IS_DEVICE(mode)) |
713 | || (preserve_specials && IS_SPECIAL(mode))) { | |
714 | uint32 *devp = F_RDEV_P(first); | |
715 | rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); | |
83d5e900 | 716 | extra_len += DEV_EXTRA_CNT * EXTRA_LEN; |
8cae71eb WD |
717 | } |
718 | if (preserve_links && S_ISLNK(mode)) | |
719 | linkname_len = strlen(F_SYMLINK(first)) + 1; | |
720 | else | |
721 | linkname_len = 0; | |
722 | goto create_object; | |
723 | } | |
724 | #endif | |
725 | ||
ba59bd68 | 726 | file_length = read_varlong30(f, 3); |
1564cd5a | 727 | if (!(xflags & XMIT_SAME_TIME)) { |
f14b3ef4 WD |
728 | if (protocol_version >= 30) { |
729 | modtime = read_varlong(f, 4); | |
730 | #if SIZEOF_TIME_T < SIZEOF_INT64 | |
731 | if ((modtime > INT_MAX || modtime < INT_MIN) && !am_generator) { | |
732 | rprintf(FERROR, | |
733 | "Time value of %s truncated on receiver.\n", | |
734 | lastname); | |
735 | } | |
736 | #endif | |
737 | } else | |
738 | modtime = read_int(f); | |
ba59bd68 | 739 | } |
1564cd5a | 740 | if (!(xflags & XMIT_SAME_MODE)) |
30f337c9 | 741 | mode = from_wire_mode(read_int(f)); |
1ef00d20 | 742 | |
ebec5eb6 | 743 | if (chmod_modes && !S_ISLNK(mode)) |
8bbe41b5 WD |
744 | mode = tweak_mode(mode, chmod_modes); |
745 | ||
9b25ef35 | 746 | if (uid_ndx && !(xflags & XMIT_SAME_UID)) { |
18438f0b WD |
747 | if (protocol_version < 30) |
748 | uid = (uid_t)read_int(f); | |
749 | else { | |
f31514ad | 750 | uid = (uid_t)read_varint(f); |
1564cd5a | 751 | if (xflags & XMIT_USER_NAME_FOLLOWS) |
18438f0b WD |
752 | uid = recv_user_name(f, uid); |
753 | else if (inc_recurse && am_root && !numeric_ids) | |
754 | uid = match_uid(uid); | |
755 | } | |
c7e6f84f | 756 | } |
9b25ef35 | 757 | if (gid_ndx && !(xflags & XMIT_SAME_GID)) { |
18438f0b WD |
758 | if (protocol_version < 30) |
759 | gid = (gid_t)read_int(f); | |
760 | else { | |
f31514ad | 761 | gid = (gid_t)read_varint(f); |
cf1b4969 | 762 | gid_flags = 0; |
1564cd5a | 763 | if (xflags & XMIT_GROUP_NAME_FOLLOWS) |
cf1b4969 | 764 | gid = recv_group_name(f, gid, &gid_flags); |
18438f0b | 765 | else if (inc_recurse && (!am_root || !numeric_ids)) |
cf1b4969 | 766 | gid = match_gid(gid, &gid_flags); |
18438f0b | 767 | } |
c7e6f84f | 768 | } |
a289addd | 769 | |
b5c6a6ae WD |
770 | if ((preserve_devices && IS_DEVICE(mode)) |
771 | || (preserve_specials && IS_SPECIAL(mode))) { | |
75bc8600 | 772 | if (protocol_version < 28) { |
1564cd5a | 773 | if (!(xflags & XMIT_SAME_RDEV_pre28)) |
b5c6a6ae WD |
774 | rdev = (dev_t)read_int(f); |
775 | } else { | |
9c5e91f8 | 776 | uint32 rdev_minor; |
1564cd5a | 777 | if (!(xflags & XMIT_SAME_RDEV_MAJOR)) |
f31514ad | 778 | rdev_major = read_varint30(f); |
18438f0b | 779 | if (protocol_version >= 30) |
f31514ad | 780 | rdev_minor = read_varint(f); |
1564cd5a | 781 | else if (xflags & XMIT_RDEV_MINOR_8_pre30) |
9c5e91f8 WD |
782 | rdev_minor = read_byte(f); |
783 | else | |
784 | rdev_minor = read_int(f); | |
b4a09b72 | 785 | rdev = MAKEDEV(rdev_major, rdev_minor); |
1ef00d20 | 786 | } |
83d5e900 | 787 | extra_len += DEV_EXTRA_CNT * EXTRA_LEN; |
96293cf9 | 788 | file_length = 0; |
b5c6a6ae | 789 | } else if (protocol_version < 28) |
b4a09b72 | 790 | rdev = MAKEDEV(0, 0); |
72914a60 | 791 | |
4f5b0756 | 792 | #ifdef SUPPORT_LINKS |
30f337c9 | 793 | if (preserve_links && S_ISLNK(mode)) { |
f31514ad | 794 | linkname_len = read_varint30(f) + 1; /* count the '\0' */ |
a289addd WD |
795 | if (linkname_len <= 0 || linkname_len > MAXPATHLEN) { |
796 | rprintf(FERROR, "overflow: linkname_len=%d\n", | |
797 | linkname_len - 1); | |
82ad07c4 | 798 | overflow_exit("recv_file_entry"); |
9dd891bb | 799 | } |
72914a60 | 800 | } |
a289addd | 801 | else |
0d162bd1 | 802 | #endif |
a289addd | 803 | linkname_len = 0; |
0d162bd1 | 804 | |
82ad07c4 | 805 | #ifdef SUPPORT_HARD_LINKS |
8cae71eb | 806 | create_object: |
4785cd43 WD |
807 | if (preserve_hard_links) { |
808 | if (protocol_version < 28 && S_ISREG(mode)) | |
1564cd5a | 809 | xflags |= XMIT_HLINKED; |
cf1b4969 | 810 | if (xflags & XMIT_HLINKED) |
4785cd43 | 811 | extra_len += EXTRA_LEN; |
82ad07c4 WD |
812 | } |
813 | #endif | |
814 | ||
1c3344a1 WD |
815 | #ifdef SUPPORT_ACLS |
816 | /* We need one or two index int32s when we're preserving ACLs. */ | |
817 | if (preserve_acls) | |
818 | extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN; | |
819 | #endif | |
820 | ||
96293cf9 WD |
821 | if (always_checksum && S_ISREG(mode)) |
822 | extra_len += SUM_EXTRA_CNT * EXTRA_LEN; | |
a289addd | 823 | |
96293cf9 WD |
824 | if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) |
825 | extra_len += EXTRA_LEN; | |
826 | ||
a3e18c76 WD |
827 | #if EXTRA_ROUNDING > 0 |
828 | if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN)) | |
829 | extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN; | |
830 | #endif | |
831 | ||
3ea6e0e7 | 832 | if (inc_recurse && S_ISDIR(mode)) { |
c7e6f84f WD |
833 | if (one_file_system) { |
834 | /* Room to save the dir's device for -x */ | |
83d5e900 | 835 | extra_len += DEV_EXTRA_CNT * EXTRA_LEN; |
c7e6f84f | 836 | } |
ef35abb2 WD |
837 | pool = dir_flist->file_pool; |
838 | } else | |
839 | pool = flist->file_pool; | |
c7e6f84f WD |
840 | |
841 | alloc_len = FILE_STRUCT_LEN + extra_len + basename_len | |
96293cf9 | 842 | + linkname_len; |
ef35abb2 | 843 | bp = pool_alloc(pool, alloc_len, "recv_file_entry"); |
9935066b | 844 | |
a3e18c76 | 845 | memset(bp, 0, extra_len + FILE_STRUCT_LEN); |
82ad07c4 | 846 | bp += extra_len; |
f5db0993 | 847 | file = (struct file_struct *)bp; |
96293cf9 WD |
848 | bp += FILE_STRUCT_LEN; |
849 | ||
850 | memcpy(bp, basename, basename_len); | |
851 | bp += basename_len + linkname_len; /* skip space for symlink too */ | |
a289addd | 852 | |
cf1b4969 | 853 | #ifdef SUPPORT_HARD_LINKS |
75f162e4 | 854 | if (xflags & XMIT_HLINKED) |
cf1b4969 WD |
855 | file->flags |= FLAG_HLINKED; |
856 | #endif | |
f14b3ef4 | 857 | file->modtime = (time_t)modtime; |
60af9465 | 858 | file->len32 = (uint32)file_length; |
96293cf9 WD |
859 | if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) { |
860 | file->flags |= FLAG_LENGTH64; | |
861 | OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32); | |
862 | } | |
a289addd | 863 | file->mode = mode; |
9b25ef35 | 864 | if (uid_ndx) |
f1482c33 | 865 | F_OWNER(file) = uid; |
9b25ef35 | 866 | if (gid_ndx) { |
f1482c33 | 867 | F_GROUP(file) = gid; |
cf1b4969 WD |
868 | file->flags |= gid_flags; |
869 | } | |
332cf6df WD |
870 | #ifdef ICONV_OPTION |
871 | if (ic_ndx) | |
9decb4d2 | 872 | F_NDX(file) = flist->used + flist->ndx_start; |
332cf6df | 873 | #endif |
a289addd | 874 | |
c7e6f84f WD |
875 | if (basename != thisname) { |
876 | file->dirname = lastdir; | |
9d737ecb | 877 | F_DEPTH(file) = lastdir_depth + 1; |
f3c3ed44 | 878 | } else |
9d737ecb | 879 | F_DEPTH(file) = 1; |
f3c3ed44 | 880 | |
649f8742 | 881 | if (S_ISDIR(mode)) { |
ee3751c8 | 882 | if (basename_len == 1+1 && *basename == '.') /* +1 for '\0' */ |
9d737ecb | 883 | F_DEPTH(file)--; |
1564cd5a | 884 | if (xflags & XMIT_TOP_DIR) { |
75c51953 | 885 | in_del_hier = recurse; |
9d737ecb | 886 | del_hier_name_len = F_DEPTH(file) == 0 ? 0 : l1 + l2; |
7a16e122 | 887 | if (relative_paths && del_hier_name_len > 2 |
9cdadbb1 WD |
888 | && lastname[del_hier_name_len-1] == '.' |
889 | && lastname[del_hier_name_len-2] == '/') | |
7a16e122 | 890 | del_hier_name_len -= 2; |
82ad07c4 | 891 | file->flags |= FLAG_TOP_DIR | FLAG_XFER_DIR; |
75f162e4 WD |
892 | } else if (protocol_version >= 30) { |
893 | if (!(xflags & XMIT_NON_XFER_DIR)) | |
894 | file->flags |= FLAG_XFER_DIR; | |
ee3751c8 | 895 | } else if (in_del_hier) { |
f3c3ed44 WD |
896 | if (!relative_paths || !del_hier_name_len |
897 | || (l1 >= del_hier_name_len | |
9cdadbb1 | 898 | && lastname[del_hier_name_len] == '/')) |
82ad07c4 | 899 | file->flags |= FLAG_XFER_DIR; |
649f8742 WD |
900 | else |
901 | in_del_hier = 0; | |
902 | } | |
903 | } | |
904 | ||
b5c6a6ae | 905 | if ((preserve_devices && IS_DEVICE(mode)) |
82ad07c4 | 906 | || (preserve_specials && IS_SPECIAL(mode))) { |
4785cd43 WD |
907 | uint32 *devp = F_RDEV_P(file); |
908 | DEV_MAJOR(devp) = major(rdev); | |
909 | DEV_MINOR(devp) = minor(rdev); | |
82ad07c4 | 910 | } |
a289addd | 911 | |
4f5b0756 | 912 | #ifdef SUPPORT_LINKS |
a289addd | 913 | if (linkname_len) { |
c58c1dc4 | 914 | bp = (char*)file->basename + basename_len; |
8cae71eb WD |
915 | if (first_hlink_ndx >= 0) { |
916 | struct file_struct *first = flist->files[first_hlink_ndx]; | |
917 | memcpy(bp, F_SYMLINK(first), linkname_len); | |
918 | } else | |
919 | read_sbuf(f, bp, linkname_len - 1); | |
1a7f3d99 | 920 | if (sanitize_paths) |
dcebf78f | 921 | sanitize_path(bp, bp, "", lastdir_depth, NULL); |
a289addd WD |
922 | } |
923 | #endif | |
924 | ||
4f5b0756 | 925 | #ifdef SUPPORT_HARD_LINKS |
75f162e4 | 926 | if (preserve_hard_links && xflags & XMIT_HLINKED) { |
8cae71eb | 927 | if (protocol_version >= 30) { |
1564cd5a | 928 | F_HL_GNUM(file) = xflags & XMIT_HLINK_FIRST |
9decb4d2 | 929 | ? flist->used : first_hlink_ndx; |
736a6a29 | 930 | } else { |
9d737ecb WD |
931 | static int32 cnt = 0; |
932 | struct idev_node *np; | |
933 | int64 ino; | |
934 | int32 ndx; | |
8cae71eb | 935 | if (protocol_version < 26) { |
9d737ecb WD |
936 | dev = read_int(f); |
937 | ino = read_int(f); | |
8cae71eb | 938 | } else { |
1564cd5a | 939 | if (!(xflags & XMIT_SAME_DEV_pre30)) |
8cae71eb | 940 | dev = read_longint(f); |
9d737ecb | 941 | ino = read_longint(f); |
8cae71eb | 942 | } |
9d737ecb | 943 | np = idev_node(dev, ino); |
424d3691 | 944 | ndx = (int32)(long)np->data - 1; |
9d737ecb WD |
945 | if (ndx < 0) { |
946 | ndx = cnt++; | |
424d3691 | 947 | np->data = (void*)(long)cnt; |
9d737ecb WD |
948 | } |
949 | F_HL_GNUM(file) = ndx; | |
736a6a29 | 950 | } |
72914a60 | 951 | } |
dc5ddbcc | 952 | #endif |
ebed4c3a | 953 | |
96293cf9 WD |
954 | if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) { |
955 | if (S_ISREG(mode)) | |
83d5e900 | 956 | bp = F_SUM(file); |
82ad07c4 | 957 | else { |
fea4db62 | 958 | /* Prior to 28, we get a useless set of nulls. */ |
82ad07c4 | 959 | bp = tmp_sum; |
fea4db62 | 960 | } |
8cae71eb WD |
961 | if (first_hlink_ndx >= 0) { |
962 | struct file_struct *first = flist->files[first_hlink_ndx]; | |
963 | memcpy(bp, F_SUM(first), checksum_len); | |
964 | } else | |
965 | read_buf(f, bp, checksum_len); | |
72914a60 | 966 | } |
ebed4c3a | 967 | |
1c3344a1 WD |
968 | #ifdef SUPPORT_ACLS |
969 | if (preserve_acls && !S_ISLNK(mode)) | |
970 | receive_acl(file, f); | |
971 | #endif | |
16edf865 WD |
972 | #ifdef SUPPORT_XATTRS |
973 | if (preserve_xattrs) | |
974 | receive_xattr(file, f ); | |
975 | #endif | |
1c3344a1 | 976 | |
ca947dea WD |
977 | if (S_ISREG(mode) || S_ISLNK(mode)) |
978 | stats.total_size += file_length; | |
979 | ||
f5db0993 | 980 | return file; |
c627d613 AT |
981 | } |
982 | ||
db719fb0 MP |
983 | /** |
984 | * Create a file_struct for a named file by reading its stat() | |
985 | * information and performing extensive checks against global | |
986 | * options. | |
987 | * | |
988 | * @return the new file, or NULL if there was an error or this file | |
989 | * should be excluded. | |
990 | * | |
991 | * @todo There is a small optimization opportunity here to avoid | |
992 | * stat()ing the file in some circumstances, which has a certain cost. | |
993 | * We are called immediately after doing readdir(), and so we may | |
994 | * already know the d_type of the file. We could for example avoid | |
995 | * statting directories if we're not recursing, but this is not a very | |
996 | * important case. Some systems may not have d_type. | |
997 | **/ | |
45d8bfe0 | 998 | struct file_struct *make_file(const char *fname, struct file_list *flist, |
82ad07c4 | 999 | STRUCT_STAT *stp, int flags, int filter_level) |
c627d613 | 1000 | { |
a289addd WD |
1001 | static char *lastdir; |
1002 | static int lastdir_len = -1; | |
3ec4dd97 | 1003 | struct file_struct *file; |
bcacc18b | 1004 | STRUCT_STAT st; |
1923b1fc | 1005 | char thisname[MAXPATHLEN]; |
e0870f1d | 1006 | char linkname[MAXPATHLEN]; |
c7e6f84f | 1007 | int alloc_len, basename_len, linkname_len; |
99a957d3 | 1008 | int extra_len = file_extra_cnt * EXTRA_LEN; |
c7e6f84f | 1009 | const char *basename; |
8ea07c00 | 1010 | alloc_pool_t *pool; |
c7e6f84f | 1011 | char *bp; |
9935066b | 1012 | |
b3b32601 | 1013 | if (strlcpy(thisname, fname, sizeof thisname) >= sizeof thisname) { |
0ee6ca98 | 1014 | rprintf(FINFO, "skipping overly long name: %s\n", fname); |
882e6893 WD |
1015 | return NULL; |
1016 | } | |
58b1999e | 1017 | clean_fname(thisname, 0); |
b7736c79 | 1018 | if (sanitize_paths) |
a2248aea | 1019 | sanitize_path(thisname, thisname, "", 0, NULL); |
3ec4dd97 | 1020 | |
e4fdf1de | 1021 | if (stp && S_ISDIR(stp->st_mode)) { |
ede1f0eb | 1022 | st = *stp; /* Needed for "symlink/." with --relative. */ |
e4fdf1de WD |
1023 | *linkname = '\0'; /* make IBM code checker happy */ |
1024 | } else if (readlink_stat(thisname, &st, linkname) != 0) { | |
76e26e10 | 1025 | int save_errno = errno; |
a4a7e64c | 1026 | /* See if file is excluded before reporting an error. */ |
7842418b | 1027 | if (filter_level != NO_FILTERS |
60cc01a6 | 1028 | && (is_excluded(thisname, 0, filter_level) |
53039410 WD |
1029 | || is_excluded(thisname, 1, filter_level))) { |
1030 | if (ignore_perishable && save_errno != ENOENT) | |
1031 | non_perishable_cnt++; | |
a4a7e64c | 1032 | return NULL; |
53039410 | 1033 | } |
a4a7e64c | 1034 | if (save_errno == ENOENT) { |
4f5b0756 | 1035 | #ifdef SUPPORT_LINKS |
a4a7e64c | 1036 | /* Avoid "vanished" error if symlink points nowhere. */ |
9439c0cb | 1037 | if (copy_links && x_lstat(thisname, &st, NULL) == 0 |
a4a7e64c WD |
1038 | && S_ISLNK(st.st_mode)) { |
1039 | io_error |= IOERR_GENERAL; | |
1040 | rprintf(FERROR, "symlink has no referent: %s\n", | |
1041 | full_fname(thisname)); | |
e5ce3bcf WD |
1042 | } else |
1043 | #endif | |
1044 | { | |
a4a7e64c WD |
1045 | enum logcode c = am_daemon && protocol_version < 28 |
1046 | ? FERROR : FINFO; | |
1047 | io_error |= IOERR_VANISHED; | |
1048 | rprintf(c, "file has vanished: %s\n", | |
1049 | full_fname(thisname)); | |
76e26e10 | 1050 | } |
a4a7e64c | 1051 | } else { |
a8726d2a | 1052 | io_error |= IOERR_GENERAL; |
d62bcc17 WD |
1053 | rsyserr(FERROR, save_errno, "readlink %s failed", |
1054 | full_fname(thisname)); | |
76e26e10 | 1055 | } |
3ec4dd97 AT |
1056 | return NULL; |
1057 | } | |
c627d613 | 1058 | |
7842418b WD |
1059 | /* backup.c calls us with filter_level set to NO_FILTERS. */ |
1060 | if (filter_level == NO_FILTERS) | |
1061 | goto skip_filters; | |
ac1a0994 | 1062 | |
75f162e4 WD |
1063 | if (S_ISDIR(st.st_mode)) { |
1064 | if (!xfer_dirs) { | |
1065 | rprintf(FINFO, "skipping directory %s\n", thisname); | |
1066 | return NULL; | |
1067 | } | |
1068 | } else | |
1069 | flags &= ~FLAG_XFER_DIR; | |
ebed4c3a | 1070 | |
d521e1c2 | 1071 | /* -x only affects directories because we need to avoid recursing |
e90cdb8a WD |
1072 | * into a mount-point directory, not to avoid copying a symlinked |
1073 | * file if -L (or similar) was specified. */ | |
535737bf WD |
1074 | if (one_file_system && st.st_dev != filesystem_dev |
1075 | && S_ISDIR(st.st_mode)) { | |
1076 | if (one_file_system > 1) { | |
1077 | if (verbose > 2) { | |
1078 | rprintf(FINFO, "skipping mount-point dir %s\n", | |
1079 | thisname); | |
ebec5eb6 | 1080 | } |
535737bf | 1081 | return NULL; |
ebec5eb6 | 1082 | } |
82ad07c4 | 1083 | flags |= FLAG_MOUNT_DIR; |
3b173846 | 1084 | } |
ebed4c3a | 1085 | |
53039410 WD |
1086 | if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) { |
1087 | if (ignore_perishable) | |
1088 | non_perishable_cnt++; | |
76e26e10 | 1089 | return NULL; |
53039410 | 1090 | } |
76e26e10 | 1091 | |
132fcf36 | 1092 | if (lp_ignore_nonreadable(module_id)) { |
4f5b0756 | 1093 | #ifdef SUPPORT_LINKS |
132fcf36 WD |
1094 | if (!S_ISLNK(st.st_mode)) |
1095 | #endif | |
1096 | if (access(thisname, R_OK) != 0) | |
1097 | return NULL; | |
1098 | } | |
ac1a0994 | 1099 | |
97b7bff4 | 1100 | skip_filters: |
ac1a0994 | 1101 | |
c7e6f84f | 1102 | /* Only divert a directory in the main transfer. */ |
8ea07c00 WD |
1103 | if (flist) { |
1104 | if (flist->prev && S_ISDIR(st.st_mode) | |
1105 | && flags & FLAG_DIVERT_DIRS) { | |
1106 | /* Room for parent/sibling/next-child info. */ | |
83d5e900 | 1107 | extra_len += DIRNODE_EXTRA_CNT * EXTRA_LEN; |
8ea07c00 WD |
1108 | dir_count++; |
1109 | pool = dir_flist->file_pool; | |
1110 | } else | |
1111 | pool = flist->file_pool; | |
1112 | } else | |
1113 | pool = NULL; | |
c7e6f84f | 1114 | |
ea847c62 WD |
1115 | if (verbose > 2) { |
1116 | rprintf(FINFO, "[%s] make_file(%s,*,%d)\n", | |
0ee6ca98 | 1117 | who_am_i(), thisname, filter_level); |
ea847c62 | 1118 | } |
ebed4c3a | 1119 | |
a289addd | 1120 | if ((basename = strrchr(thisname, '/')) != NULL) { |
c7e6f84f WD |
1121 | int len = basename++ - thisname; |
1122 | if (len != lastdir_len || memcmp(thisname, lastdir, len) != 0) { | |
1123 | lastdir = new_array(char, len + 1); | |
1124 | memcpy(lastdir, thisname, len); | |
1125 | lastdir[len] = '\0'; | |
1126 | lastdir_len = len; | |
1127 | } | |
1128 | } else | |
a289addd | 1129 | basename = thisname; |
a289addd | 1130 | basename_len = strlen(basename) + 1; /* count the '\0' */ |
c627d613 | 1131 | |
4f5b0756 | 1132 | #ifdef SUPPORT_LINKS |
a289addd WD |
1133 | linkname_len = S_ISLNK(st.st_mode) ? strlen(linkname) + 1 : 0; |
1134 | #else | |
1135 | linkname_len = 0; | |
1136 | #endif | |
1137 | ||
96293cf9 WD |
1138 | if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode)) |
1139 | extra_len += EXTRA_LEN; | |
1140 | ||
a3e18c76 WD |
1141 | #if EXTRA_ROUNDING > 0 |
1142 | if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN)) | |
1143 | extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN; | |
1144 | #endif | |
1145 | ||
c7e6f84f | 1146 | alloc_len = FILE_STRUCT_LEN + extra_len + basename_len |
96293cf9 | 1147 | + linkname_len; |
8ea07c00 WD |
1148 | if (pool) |
1149 | bp = pool_alloc(pool, alloc_len, "make_file"); | |
99aaa6ca | 1150 | else { |
9935066b | 1151 | if (!(bp = new_array(char, alloc_len))) |
99aaa6ca | 1152 | out_of_memory("make_file"); |
9935066b S |
1153 | } |
1154 | ||
a3e18c76 | 1155 | memset(bp, 0, extra_len + FILE_STRUCT_LEN); |
82ad07c4 | 1156 | bp += extra_len; |
a289addd | 1157 | file = (struct file_struct *)bp; |
96293cf9 WD |
1158 | bp += FILE_STRUCT_LEN; |
1159 | ||
1160 | memcpy(bp, basename, basename_len); | |
1161 | bp += basename_len + linkname_len; /* skip space for symlink too */ | |
82ad07c4 WD |
1162 | |
1163 | #ifdef SUPPORT_HARD_LINKS | |
c7e6f84f | 1164 | if (preserve_hard_links && flist && flist->prev) { |
82ad07c4 WD |
1165 | if (protocol_version >= 28 |
1166 | ? (!S_ISDIR(st.st_mode) && st.st_nlink > 1) | |
1167 | : S_ISREG(st.st_mode)) { | |
9d737ecb WD |
1168 | tmp_dev = st.st_dev; |
1169 | tmp_ino = st.st_ino; | |
82ad07c4 | 1170 | } else |
9d737ecb | 1171 | tmp_dev = 0; |
82ad07c4 WD |
1172 | } |
1173 | #endif | |
a289addd | 1174 | |
96293cf9 WD |
1175 | #ifdef HAVE_STRUCT_STAT_ST_RDEV |
1176 | if (IS_DEVICE(st.st_mode) || IS_SPECIAL(st.st_mode)) { | |
1177 | tmp_rdev = st.st_rdev; | |
1178 | st.st_size = 0; | |
1179 | } | |
1180 | #endif | |
1181 | ||
a289addd | 1182 | file->flags = flags; |
3ec4dd97 | 1183 | file->modtime = st.st_mtime; |
60af9465 | 1184 | file->len32 = (uint32)st.st_size; |
96293cf9 WD |
1185 | if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode)) { |
1186 | file->flags |= FLAG_LENGTH64; | |
1187 | OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32); | |
1188 | } | |
8bbe41b5 | 1189 | file->mode = st.st_mode; |
9b25ef35 | 1190 | if (uid_ndx) |
f1482c33 | 1191 | F_OWNER(file) = st.st_uid; |
9b25ef35 | 1192 | if (gid_ndx) |
f1482c33 | 1193 | F_GROUP(file) = st.st_gid; |
61dec11a | 1194 | |
c7e6f84f WD |
1195 | if (basename != thisname) |
1196 | file->dirname = lastdir; | |
a289addd | 1197 | |
4f5b0756 | 1198 | #ifdef SUPPORT_LINKS |
96293cf9 | 1199 | if (linkname_len) { |
c58c1dc4 | 1200 | bp = (char*)file->basename + basename_len; |
96293cf9 WD |
1201 | memcpy(bp, linkname, linkname_len); |
1202 | } | |
0d162bd1 WD |
1203 | #endif |
1204 | ||
82ad07c4 WD |
1205 | if (always_checksum && am_sender && S_ISREG(st.st_mode)) |
1206 | file_checksum(thisname, tmp_sum, st.st_size); | |
c627d613 | 1207 | |
ef35abb2 | 1208 | F_PATHNAME(file) = pathname; |
c627d613 | 1209 | |
23f4587f WD |
1210 | /* This code is only used by the receiver when it is building |
1211 | * a list of files for a delete pass. */ | |
1212 | if (keep_dirlinks && linkname_len && flist) { | |
1213 | STRUCT_STAT st2; | |
f5db0993 | 1214 | int save_mode = file->mode; |
8bbe41b5 | 1215 | file->mode = S_IFDIR; /* Find a directory with our name. */ |
c7e6f84f | 1216 | if (flist_find(dir_flist, file) >= 0 |
8ea07c00 | 1217 | && x_stat(thisname, &st2, NULL) == 0 && S_ISDIR(st2.st_mode)) { |
23f4587f | 1218 | file->modtime = st2.st_mtime; |
96293cf9 | 1219 | file->len32 = 0; |
23f4587f | 1220 | file->mode = st2.st_mode; |
9b25ef35 | 1221 | if (uid_ndx) |
f1482c33 | 1222 | F_OWNER(file) = st2.st_uid; |
9b25ef35 | 1223 | if (gid_ndx) |
f1482c33 | 1224 | F_GROUP(file) = st2.st_gid; |
f5db0993 WD |
1225 | } else |
1226 | file->mode = save_mode; | |
23f4587f WD |
1227 | } |
1228 | ||
82ad07c4 WD |
1229 | if (basename_len == 0+1) |
1230 | return NULL; | |
1231 | ||
a6e7b978 | 1232 | #ifdef ICONV_OPTION |
8ea07c00 WD |
1233 | if (ic_ndx) |
1234 | F_NDX(file) = dir_count - 1; | |
76e754a0 | 1235 | #endif |
c7e6f84f | 1236 | |
3ec4dd97 | 1237 | return file; |
c627d613 AT |
1238 | } |
1239 | ||
17026f27 | 1240 | /* Only called for temporary file_struct entries created by make_file(). */ |
82ad07c4 WD |
1241 | void unmake_file(struct file_struct *file) |
1242 | { | |
99a957d3 | 1243 | int extra_cnt = file_extra_cnt + LEN64_BUMP(file); |
a3e18c76 WD |
1244 | #if EXTRA_ROUNDING > 0 |
1245 | if (extra_cnt & EXTRA_ROUNDING) | |
1246 | extra_cnt = (extra_cnt | EXTRA_ROUNDING) + 1; | |
1247 | #endif | |
1248 | free(REQ_EXTRA(file, extra_cnt)); | |
82ad07c4 WD |
1249 | } |
1250 | ||
42c6b139 | 1251 | static struct file_struct *send_file_name(int f, struct file_list *flist, |
ede1f0eb | 1252 | char *fname, STRUCT_STAT *stp, |
252af65b | 1253 | int flags, int filter_level) |
c627d613 | 1254 | { |
ebed4c3a | 1255 | struct file_struct *file; |
16edf865 | 1256 | #if defined SUPPORT_ACLS || defined SUPPORT_XATTRS |
1c3344a1 WD |
1257 | statx sx; |
1258 | #endif | |
ebed4c3a | 1259 | |
252af65b | 1260 | file = make_file(fname, flist, stp, flags, filter_level); |
37802f40 | 1261 | if (!file) |
301fb56c | 1262 | return NULL; |
ebed4c3a | 1263 | |
ebec5eb6 | 1264 | if (chmod_modes && !S_ISLNK(file->mode)) |
8bbe41b5 WD |
1265 | file->mode = tweak_mode(file->mode, chmod_modes); |
1266 | ||
1c3344a1 WD |
1267 | #ifdef SUPPORT_ACLS |
1268 | if (preserve_acls && !S_ISLNK(file->mode) && f >= 0) { | |
1269 | sx.st.st_mode = file->mode; | |
1270 | sx.acc_acl = sx.def_acl = NULL; | |
1271 | if (get_acl(fname, &sx) < 0) | |
1272 | return NULL; | |
1273 | } | |
1274 | #endif | |
16edf865 WD |
1275 | #ifdef SUPPORT_XATTRS |
1276 | if (preserve_xattrs && f >= 0) { | |
1277 | sx.xattr = NULL; | |
1278 | if (get_xattr(fname, &sx) < 0) | |
1279 | return NULL; | |
1280 | } | |
1281 | #endif | |
1c3344a1 | 1282 | |
9decb4d2 | 1283 | maybe_emit_filelist_progress(flist->used + flist_count_offset); |
ebed4c3a | 1284 | |
8ea07c00 | 1285 | flist_expand(flist, 1); |
9decb4d2 | 1286 | flist->files[flist->used++] = file; |
1c3344a1 | 1287 | if (f >= 0) { |
9decb4d2 | 1288 | send_file_entry(f, file, flist->used - 1); |
1c3344a1 WD |
1289 | #ifdef SUPPORT_ACLS |
1290 | if (preserve_acls && !S_ISLNK(file->mode)) { | |
1291 | send_acl(&sx, f); | |
1292 | free_acl(&sx); | |
1293 | } | |
16edf865 WD |
1294 | #endif |
1295 | #ifdef SUPPORT_XATTRS | |
1296 | if (preserve_xattrs) { | |
1297 | F_XATTR(file) = send_xattr(&sx, f); | |
1298 | free_xattr(&sx); | |
1299 | } | |
1c3344a1 WD |
1300 | #endif |
1301 | } | |
301fb56c WD |
1302 | return file; |
1303 | } | |
ebed4c3a | 1304 | |
301fb56c | 1305 | static void send_if_directory(int f, struct file_list *flist, |
56f0c976 | 1306 | struct file_struct *file, |
c7e6f84f WD |
1307 | char *fbuf, unsigned int ol, |
1308 | int flags) | |
301fb56c | 1309 | { |
56f0c976 | 1310 | char is_dot_dir = fbuf[ol-1] == '.' && (ol == 1 || fbuf[ol-2] == '/'); |
301fb56c WD |
1311 | |
1312 | if (S_ISDIR(file->mode) | |
82ad07c4 | 1313 | && !(file->flags & FLAG_MOUNT_DIR) && f_name(file, fbuf)) { |
f1773e09 WD |
1314 | void *save_filters; |
1315 | unsigned int len = strlen(fbuf); | |
1316 | if (len > 1 && fbuf[len-1] == '/') | |
1317 | fbuf[--len] = '\0'; | |
1318 | if (len >= MAXPATHLEN - 1) { | |
1319 | io_error |= IOERR_GENERAL; | |
1320 | rprintf(FERROR, "skipping long-named directory: %s\n", | |
1321 | full_fname(fbuf)); | |
1322 | return; | |
1323 | } | |
1324 | save_filters = push_local_filters(fbuf, len); | |
a6e7b978 | 1325 | send_directory(f, flist, fbuf, len, flags); |
f1773e09 | 1326 | pop_local_filters(save_filters); |
56f0c976 WD |
1327 | fbuf[ol] = '\0'; |
1328 | if (is_dot_dir) | |
1329 | fbuf[ol-1] = '.'; | |
ebed4c3a | 1330 | } |
c627d613 AT |
1331 | } |
1332 | ||
a572e126 WD |
1333 | static int file_compare(const void *file1, const void *file2) |
1334 | { | |
1335 | return f_name_cmp(*(struct file_struct **)file1, | |
1336 | *(struct file_struct **)file2); | |
1337 | } | |
1338 | ||
56ce72c4 | 1339 | /* The guts of a merge-sort algorithm. This was derived from the glibc |
a572e126 WD |
1340 | * version, but I (Wayne) changed the merge code to do less copying and |
1341 | * to require only half the amount of temporary memory. */ | |
1342 | static void fsort_tmp(struct file_struct **fp, size_t num, | |
1343 | struct file_struct **tmp) | |
1344 | { | |
1345 | struct file_struct **f1, **f2, **t; | |
1346 | size_t n1, n2; | |
1347 | ||
1348 | n1 = num / 2; | |
1349 | n2 = num - n1; | |
1350 | f1 = fp; | |
1351 | f2 = fp + n1; | |
1352 | ||
1353 | if (n1 > 1) | |
1354 | fsort_tmp(f1, n1, tmp); | |
1355 | if (n2 > 1) | |
1356 | fsort_tmp(f2, n2, tmp); | |
1357 | ||
1358 | while (f_name_cmp(*f1, *f2) <= 0) { | |
1359 | if (!--n1) | |
1360 | return; | |
1361 | f1++; | |
1362 | } | |
1363 | ||
1364 | t = tmp; | |
1365 | memcpy(t, f1, n1 * PTR_SIZE); | |
1366 | ||
1367 | *f1++ = *f2++, n2--; | |
1368 | ||
1369 | while (n1 > 0 && n2 > 0) { | |
1370 | if (f_name_cmp(*t, *f2) <= 0) | |
1371 | *f1++ = *t++, n1--; | |
1372 | else | |
1373 | *f1++ = *f2++, n2--; | |
1374 | } | |
1375 | ||
1376 | if (n1 > 0) | |
1377 | memcpy(f1, t, n1 * PTR_SIZE); | |
1378 | } | |
1379 | ||
1380 | /* This file-struct sorting routine makes sure that any identical names in | |
1381 | * the file list stay in the same order as they were in the original list. | |
1382 | * This is particularly vital in inc_recurse mode where we expect a sort | |
1383 | * on the flist to match the exact order of a sort on the dir_flist. */ | |
1384 | static void fsort(struct file_struct **fp, size_t num) | |
c7e6f84f | 1385 | { |
a572e126 WD |
1386 | if (num <= 1) |
1387 | return; | |
1388 | ||
1389 | if (use_qsort) | |
1390 | qsort(fp, num, PTR_SIZE, file_compare); | |
1391 | else { | |
1392 | struct file_struct **tmp = new_array(struct file_struct *, | |
1393 | (num+1) / 2); | |
1394 | fsort_tmp(fp, num, tmp); | |
1395 | free(tmp); | |
1396 | } | |
c7e6f84f WD |
1397 | } |
1398 | ||
8ea07c00 WD |
1399 | /* We take an entire set of sibling dirs from the sorted flist and link them |
1400 | * into the tree, setting the appropriate parent/child/sibling pointers. */ | |
1401 | static void add_dirs_to_tree(int parent_ndx, struct file_list *from_flist, | |
1402 | int dir_cnt) | |
c7e6f84f WD |
1403 | { |
1404 | int i; | |
1405 | int32 *dp = NULL; | |
1406 | int32 *parent_dp = parent_ndx < 0 ? NULL | |
83d5e900 | 1407 | : F_DIR_NODE_P(dir_flist->sorted[parent_ndx]); |
c7e6f84f | 1408 | |
8ea07c00 WD |
1409 | flist_expand(dir_flist, dir_cnt); |
1410 | dir_flist->sorted = dir_flist->files; | |
c7e6f84f | 1411 | |
8ea07c00 WD |
1412 | for (i = 0; dir_cnt; i++) { |
1413 | struct file_struct *file = from_flist->sorted[i]; | |
1414 | ||
1415 | if (!S_ISDIR(file->mode)) | |
1416 | continue; | |
1417 | ||
9decb4d2 | 1418 | dir_flist->files[dir_flist->used++] = file; |
8ea07c00 | 1419 | dir_cnt--; |
ae87c434 | 1420 | |
c7e6f84f WD |
1421 | if (!(file->flags & FLAG_XFER_DIR) |
1422 | || file->flags & FLAG_MOUNT_DIR) | |
1423 | continue; | |
8ea07c00 | 1424 | |
c7e6f84f | 1425 | if (dp) |
9decb4d2 | 1426 | DIR_NEXT_SIBLING(dp) = dir_flist->used - 1; |
c7e6f84f | 1427 | else if (parent_dp) |
9decb4d2 | 1428 | DIR_FIRST_CHILD(parent_dp) = dir_flist->used - 1; |
c7e6f84f | 1429 | else |
9decb4d2 | 1430 | send_dir_ndx = dir_flist->used - 1; |
8ea07c00 | 1431 | |
83d5e900 | 1432 | dp = F_DIR_NODE_P(file); |
c7e6f84f WD |
1433 | DIR_PARENT(dp) = parent_ndx; |
1434 | DIR_FIRST_CHILD(dp) = -1; | |
1435 | } | |
1436 | if (dp) | |
1437 | DIR_NEXT_SIBLING(dp) = -1; | |
1438 | } | |
1439 | ||
301fb56c | 1440 | /* This function is normally called by the sender, but the receiving side also |
7b558d7f | 1441 | * calls it from get_dirlist() with f set to -1 so that we just construct the |
301fb56c WD |
1442 | * file list in memory without sending it over the wire. Also, get_dirlist() |
1443 | * might call this with f set to -2, which also indicates that local filter | |
1444 | * rules should be ignored. */ | |
a6e7b978 WD |
1445 | static void send_directory(int f, struct file_list *flist, char *fbuf, int len, |
1446 | int flags) | |
c627d613 | 1447 | { |
3ec4dd97 | 1448 | struct dirent *di; |
32cbfe7b | 1449 | unsigned remainder; |
3ec4dd97 | 1450 | char *p; |
f1773e09 | 1451 | DIR *d; |
c7e6f84f | 1452 | int divert_dirs = (flags & FLAG_DIVERT_DIRS) != 0; |
9decb4d2 | 1453 | int start = flist->used; |
252af65b | 1454 | int filter_level = f == -2 ? SERVER_FILTERS : ALL_FILTERS; |
c7e6f84f WD |
1455 | |
1456 | assert(flist != NULL); | |
3ec4dd97 | 1457 | |
f1773e09 | 1458 | if (!(d = opendir(fbuf))) { |
06c28400 | 1459 | io_error |= IOERR_GENERAL; |
f1773e09 | 1460 | rsyserr(FERROR, errno, "opendir %s failed", full_fname(fbuf)); |
3ec4dd97 AT |
1461 | return; |
1462 | } | |
c627d613 | 1463 | |
19b2a5d9 WD |
1464 | p = fbuf + len; |
1465 | if (len != 1 || *fbuf != '/') | |
eddd5d12 | 1466 | *p++ = '/'; |
f1773e09 | 1467 | *p = '\0'; |
32cbfe7b | 1468 | remainder = MAXPATHLEN - (p - fbuf); |
ebed4c3a | 1469 | |
6a7cc46c | 1470 | for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) { |
d6e6ecbd | 1471 | char *dname = d_name(di); |
6a7cc46c S |
1472 | if (dname[0] == '.' && (dname[1] == '\0' |
1473 | || (dname[1] == '.' && dname[2] == '\0'))) | |
3ec4dd97 | 1474 | continue; |
0ee6ca98 | 1475 | if (strlcpy(p, dname, remainder) >= remainder) { |
eddd5d12 WD |
1476 | io_error |= IOERR_GENERAL; |
1477 | rprintf(FINFO, | |
1478 | "cannot send long-named file %s\n", | |
f1773e09 | 1479 | full_fname(fbuf)); |
beaf4954 | 1480 | continue; |
eddd5d12 | 1481 | } |
411c04f0 WD |
1482 | if (dname[0] == '\0') { |
1483 | io_error |= IOERR_GENERAL; | |
1484 | rprintf(FINFO, | |
1485 | "cannot send file with empty name in %s\n", | |
1486 | full_fname(fbuf)); | |
1487 | continue; | |
1488 | } | |
0ee6ca98 | 1489 | |
252af65b | 1490 | send_file_name(f, flist, fbuf, NULL, flags, filter_level); |
3ec4dd97 | 1491 | } |
32cbfe7b WD |
1492 | |
1493 | fbuf[len] = '\0'; | |
1494 | ||
6a7cc46c | 1495 | if (errno) { |
06c28400 | 1496 | io_error |= IOERR_GENERAL; |
71903f60 | 1497 | rsyserr(FERROR, errno, "readdir(%s)", full_fname(fbuf)); |
6a7cc46c | 1498 | } |
c627d613 | 1499 | |
3ec4dd97 | 1500 | closedir(d); |
301fb56c | 1501 | |
a6e7b978 | 1502 | if (f >= 0 && recurse && !divert_dirs) { |
9decb4d2 WD |
1503 | int i, end = flist->used - 1; |
1504 | /* send_if_directory() bumps flist->used, so use "end". */ | |
301fb56c | 1505 | for (i = start; i <= end; i++) |
c7e6f84f WD |
1506 | send_if_directory(f, flist, flist->files[i], fbuf, len, flags); |
1507 | } | |
1508 | } | |
1509 | ||
a6e7b978 | 1510 | static void send1extra(int f, struct file_struct *file, struct file_list *flist) |
c7e6f84f WD |
1511 | { |
1512 | char fbuf[MAXPATHLEN]; | |
a6e7b978 WD |
1513 | int dlen; |
1514 | ||
1515 | f_name(file, fbuf); | |
1516 | dlen = strlen(fbuf); | |
1517 | ||
1518 | if (F_PATHNAME(file) != pathname) { | |
1519 | if (!push_pathname(F_PATHNAME(file), -1)) | |
1520 | exit_cleanup(RERR_FILESELECT); | |
1521 | } | |
1522 | ||
1523 | change_local_filter_dir(fbuf, dlen, send_dir_depth); | |
1524 | ||
1525 | send_directory(f, flist, fbuf, dlen, FLAG_DIVERT_DIRS | FLAG_XFER_DIR); | |
1526 | } | |
1527 | ||
1528 | void send_extra_file_list(int f, int at_least) | |
1529 | { | |
c7e6f84f WD |
1530 | struct file_list *flist; |
1531 | int64 start_write; | |
7a2fa0c2 | 1532 | int future_cnt, save_io_error = io_error; |
c7e6f84f | 1533 | |
25c2a6ac | 1534 | if (flist_eof) |
c7e6f84f WD |
1535 | return; |
1536 | ||
1537 | /* Keep sending data until we have the requested number of | |
1538 | * files in the upcoming file-lists. */ | |
7a2fa0c2 WD |
1539 | if (cur_flist->next) { |
1540 | flist = first_flist->prev; /* the newest flist */ | |
5459e693 | 1541 | future_cnt = flist->ndx_end - cur_flist->next->ndx_start + 1; |
7a2fa0c2 WD |
1542 | } else |
1543 | future_cnt = 0; | |
1544 | while (future_cnt < at_least) { | |
a6e7b978 | 1545 | struct file_struct *file = dir_flist->sorted[send_dir_ndx]; |
79028af1 | 1546 | int dir_ndx, dstart = dir_count; |
c7e6f84f | 1547 | int32 *dp; |
c7e6f84f WD |
1548 | |
1549 | flist = flist_new(0, "send_extra_file_list"); | |
4c9d5fef | 1550 | start_write = stats.total_written; |
c7e6f84f | 1551 | |
332cf6df | 1552 | #ifdef ICONV_OPTION |
79028af1 WD |
1553 | if (ic_ndx) |
1554 | dir_ndx = F_NDX(file); | |
1555 | else | |
a6e7b978 | 1556 | #endif |
79028af1 WD |
1557 | dir_ndx = send_dir_ndx; |
1558 | write_ndx(f, NDX_FLIST_OFFSET - dir_ndx); | |
5459e693 | 1559 | flist->parent_ndx = dir_ndx; |
a6e7b978 | 1560 | |
79028af1 | 1561 | send1extra(f, file, flist); |
83d5e900 | 1562 | dp = F_DIR_NODE_P(file); |
a6e7b978 | 1563 | |
79028af1 WD |
1564 | /* If there are any duplicate directory names that follow, we |
1565 | * send all the dirs together in one file-list. The dir_flist | |
1566 | * tree links all the child subdirs onto the last dup dir. */ | |
1567 | while ((dir_ndx = DIR_NEXT_SIBLING(dp)) >= 0 | |
1568 | && dir_flist->sorted[dir_ndx]->flags & FLAG_DUPLICATE) { | |
1569 | send_dir_ndx = dir_ndx; | |
1570 | file = dir_flist->sorted[dir_ndx]; | |
a6e7b978 | 1571 | send1extra(f, file, flist); |
83d5e900 | 1572 | dp = F_DIR_NODE_P(file); |
a6e7b978 | 1573 | } |
79028af1 | 1574 | |
a6e7b978 WD |
1575 | write_byte(f, 0); |
1576 | ||
a6e7b978 WD |
1577 | #ifdef ICONV_OPTION |
1578 | if (need_unsorted_flist) { | |
9decb4d2 | 1579 | if (!(flist->sorted = new_array(struct file_struct *, flist->used))) |
8ea07c00 WD |
1580 | out_of_memory("send_extra_file_list"); |
1581 | memcpy(flist->sorted, flist->files, | |
9decb4d2 | 1582 | flist->used * sizeof (struct file_struct*)); |
a6e7b978 | 1583 | } else |
332cf6df | 1584 | #endif |
332cf6df | 1585 | flist->sorted = flist->files; |
8ea07c00 WD |
1586 | |
1587 | clean_flist(flist, 0); | |
1588 | ||
5459e693 WD |
1589 | flist->ndx_end = flist->ndx_start + flist->used - 1 |
1590 | - (dir_count - dstart); | |
1591 | ||
8ea07c00 | 1592 | add_dirs_to_tree(send_dir_ndx, flist, dir_count - dstart); |
abdcb21a | 1593 | flist_done_allocating(flist); |
a6e7b978 | 1594 | |
9decb4d2 WD |
1595 | file_total += flist->used; |
1596 | future_cnt += flist->used; | |
c7e6f84f | 1597 | stats.flist_size += stats.total_written - start_write; |
9decb4d2 | 1598 | stats.num_files += flist->used; |
c7e6f84f WD |
1599 | if (verbose > 3) |
1600 | output_flist(flist); | |
1601 | ||
c7e6f84f WD |
1602 | if (DIR_FIRST_CHILD(dp) >= 0) { |
1603 | send_dir_ndx = DIR_FIRST_CHILD(dp); | |
1604 | send_dir_depth++; | |
1605 | } else { | |
1606 | while (DIR_NEXT_SIBLING(dp) < 0) { | |
1607 | if ((send_dir_ndx = DIR_PARENT(dp)) < 0) { | |
9ae7a2cd | 1608 | write_ndx(f, NDX_FLIST_EOF); |
c7e6f84f WD |
1609 | flist_eof = 1; |
1610 | change_local_filter_dir(NULL, 0, 0); | |
1611 | goto finish; | |
1612 | } | |
1613 | send_dir_depth--; | |
a6e7b978 | 1614 | file = dir_flist->sorted[send_dir_ndx]; |
83d5e900 | 1615 | dp = F_DIR_NODE_P(file); |
c7e6f84f WD |
1616 | } |
1617 | send_dir_ndx = DIR_NEXT_SIBLING(dp); | |
1618 | } | |
301fb56c | 1619 | } |
c7e6f84f WD |
1620 | |
1621 | finish: | |
1622 | if (io_error != save_io_error && !ignore_errors) | |
1623 | send_msg_int(MSG_IO_ERROR, io_error); | |
c627d613 AT |
1624 | } |
1625 | ||
ebed4c3a | 1626 | struct file_list *send_file_list(int f, int argc, char *argv[]) |
c627d613 | 1627 | { |
3bb88b43 WD |
1628 | static const char *lastdir; |
1629 | static int lastdir_len = -1; | |
1630 | int len, dirlen; | |
bcacc18b | 1631 | STRUCT_STAT st; |
c7e6f84f | 1632 | char *p, *dir; |
ebed4c3a | 1633 | char lastpath[MAXPATHLEN] = ""; |
649d65ed | 1634 | struct file_list *flist; |
31b4d25d | 1635 | struct timeval start_tv, end_tv; |
a800434a | 1636 | int64 start_write; |
24d0fcde | 1637 | int use_ff_fd = 0; |
c7e6f84f | 1638 | int flags, disable_buffering; |
649d65ed | 1639 | |
ea124cb3 | 1640 | rprintf(FLOG, "building file list\n"); |
134f4338 | 1641 | if (show_filelist_p()) |
1bbd10fe | 1642 | start_filelist_progress("building file list"); |
3ea6e0e7 | 1643 | else if (inc_recurse && verbose && !am_server) |
98b1689d | 1644 | rprintf(FCLIENT, "sending incremental file list\n"); |
c627d613 | 1645 | |
a800434a | 1646 | start_write = stats.total_written; |
31b4d25d | 1647 | gettimeofday(&start_tv, NULL); |
a800434a | 1648 | |
8cae71eb | 1649 | #ifdef SUPPORT_HARD_LINKS |
c7e6f84f | 1650 | if (preserve_hard_links && protocol_version >= 30 && !cur_flist) |
8cae71eb WD |
1651 | init_hard_links(); |
1652 | #endif | |
1653 | ||
c7e6f84f | 1654 | flist = cur_flist = flist_new(0, "send_file_list"); |
3ea6e0e7 | 1655 | if (inc_recurse) { |
c7e6f84f | 1656 | dir_flist = flist_new(FLIST_TEMP, "send_file_list"); |
75f162e4 | 1657 | flags = FLAG_DIVERT_DIRS | FLAG_XFER_DIR; |
c7e6f84f WD |
1658 | } else { |
1659 | dir_flist = cur_flist; | |
75f162e4 | 1660 | flags = FLAG_XFER_DIR; |
c7e6f84f | 1661 | } |
c627d613 | 1662 | |
c7e6f84f | 1663 | disable_buffering = io_start_buffering_out(f); |
134f4338 | 1664 | if (filesfrom_fd >= 0) { |
6f3684ff | 1665 | if (argv[0] && !push_dir(argv[0], 0)) { |
63d83e94 WD |
1666 | rsyserr(FERROR, errno, "push_dir %s failed in %s", |
1667 | full_fname(argv[0]), curr_dir); | |
134f4338 | 1668 | exit_cleanup(RERR_FILESELECT); |
24d0fcde | 1669 | } |
134f4338 | 1670 | use_ff_fd = 1; |
d6dead6b AT |
1671 | } |
1672 | ||
24d0fcde | 1673 | while (1) { |
56f0c976 WD |
1674 | char fbuf[MAXPATHLEN]; |
1675 | char *fn; | |
301fb56c | 1676 | int is_dot_dir; |
c627d613 | 1677 | |
24d0fcde | 1678 | if (use_ff_fd) { |
56f0c976 | 1679 | if (read_filesfrom_line(filesfrom_fd, fbuf) == 0) |
24d0fcde | 1680 | break; |
a2248aea | 1681 | sanitize_path(fbuf, fbuf, "", 0, NULL); |
24d0fcde WD |
1682 | } else { |
1683 | if (argc-- == 0) | |
1684 | break; | |
56f0c976 | 1685 | strlcpy(fbuf, *argv++, MAXPATHLEN); |
24d0fcde | 1686 | if (sanitize_paths) |
a2248aea | 1687 | sanitize_path(fbuf, fbuf, "", 0, NULL); |
24d0fcde | 1688 | } |
c627d613 | 1689 | |
56f0c976 | 1690 | len = strlen(fbuf); |
1902a765 WD |
1691 | if (relative_paths) { |
1692 | /* We clean up fbuf below. */ | |
1693 | is_dot_dir = 0; | |
1694 | } else if (!len || fbuf[len - 1] == '/') { | |
56f0c976 | 1695 | if (len == 2 && fbuf[0] == '.') { |
6931c138 | 1696 | /* Turn "./" into just "." rather than "./." */ |
56f0c976 | 1697 | fbuf[1] = '\0'; |
557a35f5 | 1698 | } else { |
56f0c976 | 1699 | if (len + 1 >= MAXPATHLEN) |
a1f99493 | 1700 | overflow_exit("send_file_list"); |
56f0c976 WD |
1701 | fbuf[len++] = '.'; |
1702 | fbuf[len] = '\0'; | |
53f821f1 | 1703 | } |
301fb56c | 1704 | is_dot_dir = 1; |
56f0c976 WD |
1705 | } else if (len > 1 && fbuf[len-1] == '.' && fbuf[len-2] == '.' |
1706 | && (len == 2 || fbuf[len-3] == '/')) { | |
1707 | if (len + 2 >= MAXPATHLEN) | |
a1f99493 | 1708 | overflow_exit("send_file_list"); |
56f0c976 WD |
1709 | fbuf[len++] = '/'; |
1710 | fbuf[len++] = '.'; | |
1711 | fbuf[len] = '\0'; | |
a289f89f | 1712 | is_dot_dir = 1; |
301fb56c | 1713 | } else { |
56f0c976 WD |
1714 | is_dot_dir = fbuf[len-1] == '.' |
1715 | && (len == 1 || fbuf[len-2] == '/'); | |
649d65ed | 1716 | } |
c627d613 | 1717 | |
649d65ed AT |
1718 | dir = NULL; |
1719 | ||
1720 | if (!relative_paths) { | |
56f0c976 | 1721 | p = strrchr(fbuf, '/'); |
649d65ed | 1722 | if (p) { |
151f59f1 | 1723 | *p = '\0'; |
56f0c976 | 1724 | if (p == fbuf) |
649d65ed AT |
1725 | dir = "/"; |
1726 | else | |
56f0c976 WD |
1727 | dir = fbuf; |
1728 | len -= p - fbuf + 1; | |
1729 | fn = p + 1; | |
1730 | } else | |
1731 | fn = fbuf; | |
1902a765 WD |
1732 | } else { |
1733 | if ((p = strstr(fbuf, "/./")) != NULL) { | |
1734 | *p = '\0'; | |
1735 | if (p == fbuf) | |
1736 | dir = "/"; | |
1737 | else | |
1738 | dir = fbuf; | |
1739 | len -= p - fbuf + 3; | |
1740 | fn = p + 3; | |
1741 | } else | |
1742 | fn = fbuf; | |
1743 | /* Get rid of trailing "/" and "/.". */ | |
1744 | while (len) { | |
ede1f0eb WD |
1745 | if (fn[len - 1] == '/') { |
1746 | is_dot_dir = 1; | |
1747 | if (!--len && !dir) { | |
1748 | len++; | |
1749 | break; | |
1750 | } | |
1751 | } | |
1902a765 WD |
1752 | else if (len >= 2 && fn[len - 1] == '.' |
1753 | && fn[len - 2] == '/') { | |
ede1f0eb | 1754 | is_dot_dir = 1; |
1902a765 WD |
1755 | if (!(len -= 2) && !dir) { |
1756 | len++; | |
1757 | break; | |
1758 | } | |
1759 | } else | |
1760 | break; | |
1761 | } | |
8c449e62 WD |
1762 | if (len == 1 && fn[0] == '/') |
1763 | fn[len++] = '.'; | |
1902a765 WD |
1764 | fn[len] = '\0'; |
1765 | /* Reject a ".." dir in the active part of the path. */ | |
ede1f0eb WD |
1766 | for (p = fn; (p = strstr(p, "..")) != NULL; p += 2) { |
1767 | if ((p[2] == '/' || p[2] == '\0') | |
1768 | && (p == fn || p[-1] == '/')) { | |
1769 | rprintf(FERROR, | |
1770 | "found \"..\" dir in relative path: %s\n", | |
1771 | fbuf); | |
1772 | exit_cleanup(RERR_SYNTAX); | |
1773 | } | |
1902a765 WD |
1774 | } |
1775 | } | |
d2ea5980 | 1776 | |
56f0c976 WD |
1777 | if (!*fn) { |
1778 | len = 1; | |
1779 | fn = "."; | |
1780 | } | |
d2ea5980 | 1781 | |
3bb88b43 WD |
1782 | dirlen = dir ? strlen(dir) : 0; |
1783 | if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) { | |
ef35abb2 | 1784 | if (!push_pathname(dir ? strdup(dir) : NULL, dirlen)) |
3bb88b43 | 1785 | goto push_error; |
ef35abb2 WD |
1786 | lastdir = pathname; |
1787 | lastdir_len = pathname_len; | |
1788 | } else if (!push_pathname(lastdir, lastdir_len)) { | |
3bb88b43 WD |
1789 | push_error: |
1790 | io_error |= IOERR_GENERAL; | |
1791 | rsyserr(FERROR, errno, "push_dir %s failed in %s", | |
1792 | full_fname(dir), curr_dir); | |
1793 | continue; | |
d2ea5980 WD |
1794 | } |
1795 | ||
99eba675 | 1796 | if (fn != fbuf) |
56f0c976 WD |
1797 | memmove(fbuf, fn, len + 1); |
1798 | ||
25c2a6ac WD |
1799 | if (link_stat(fbuf, &st, copy_dirlinks) != 0) { |
1800 | io_error |= IOERR_GENERAL; | |
1801 | rsyserr(FERROR, errno, "link_stat %s failed", | |
1802 | full_fname(fbuf)); | |
1803 | continue; | |
1804 | } | |
1805 | ||
1806 | if (S_ISDIR(st.st_mode) && !xfer_dirs) { | |
1807 | rprintf(FINFO, "skipping directory %s\n", fbuf); | |
1808 | continue; | |
1809 | } | |
1810 | ||
56f0c976 | 1811 | if (implied_dirs && (p=strrchr(fbuf,'/')) && p != fbuf) { |
151f59f1 WD |
1812 | /* Send the implied directories at the start of the |
1813 | * source spec, so we get their permissions right. */ | |
56f0c976 | 1814 | char *lp = lastpath, *slash = fbuf; |
151f59f1 | 1815 | *p = '\0'; |
2154309a WD |
1816 | /* Skip any initial directories in our path that we |
1817 | * have in common with lastpath. */ | |
56f0c976 | 1818 | for (fn = fbuf; *fn && *lp == *fn; lp++, fn++) { |
2154309a WD |
1819 | if (*fn == '/') |
1820 | slash = fn; | |
2154309a WD |
1821 | } |
1822 | *p = '/'; | |
1823 | if (fn != p || (*lp && *lp != '/')) { | |
0f57446d | 1824 | int save_copy_links = copy_links; |
7e037c42 | 1825 | int save_xfer_dirs = xfer_dirs; |
75f162e4 | 1826 | int dir_flags = flags & ~FLAG_XFER_DIR; |
88c2190a | 1827 | copy_links |= copy_unsafe_links; |
7e037c42 | 1828 | xfer_dirs = 1; |
2154309a | 1829 | while ((slash = strchr(slash+1, '/')) != 0) { |
151f59f1 | 1830 | *slash = '\0'; |
42c6b139 WD |
1831 | send_file_name(f, flist, fbuf, NULL, |
1832 | dir_flags, ALL_FILTERS); | |
2154309a | 1833 | *slash = '/'; |
649d65ed | 1834 | } |
0f57446d | 1835 | copy_links = save_copy_links; |
7e037c42 | 1836 | xfer_dirs = save_xfer_dirs; |
151f59f1 | 1837 | *p = '\0'; |
56f0c976 | 1838 | strlcpy(lastpath, fbuf, sizeof lastpath); |
649d65ed AT |
1839 | *p = '/'; |
1840 | } | |
1841 | } | |
ebed4c3a | 1842 | |
535737bf WD |
1843 | if (one_file_system) |
1844 | filesystem_dev = st.st_dev; | |
1845 | ||
75c51953 | 1846 | if (recurse || (xfer_dirs && is_dot_dir)) { |
42c6b139 | 1847 | struct file_struct *file; |
75f162e4 | 1848 | int top_flags = FLAG_TOP_DIR | flags; |
42c6b139 WD |
1849 | file = send_file_name(f, flist, fbuf, &st, |
1850 | top_flags, ALL_FILTERS); | |
3ea6e0e7 | 1851 | if (file && !inc_recurse) |
42c6b139 WD |
1852 | send_if_directory(f, flist, file, fbuf, len, flags); |
1853 | } else | |
1854 | send_file_name(f, flist, fbuf, &st, flags, ALL_FILTERS); | |
649d65ed | 1855 | } |
dc5ddbcc | 1856 | |
134f4338 WD |
1857 | gettimeofday(&end_tv, NULL); |
1858 | stats.flist_buildtime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000 | |
1859 | + (end_tv.tv_usec - start_tv.tv_usec) / 1000; | |
1860 | if (stats.flist_buildtime == 0) | |
1861 | stats.flist_buildtime = 1; | |
1862 | start_tv = end_tv; | |
31b4d25d | 1863 | |
8cae71eb WD |
1864 | write_byte(f, 0); /* Indicate end of file list */ |
1865 | ||
1866 | #ifdef SUPPORT_HARD_LINKS | |
3ea6e0e7 | 1867 | if (preserve_hard_links && protocol_version >= 30 && !inc_recurse) |
8cae71eb WD |
1868 | idev_destroy(); |
1869 | #endif | |
c627d613 | 1870 | |
134f4338 WD |
1871 | if (show_filelist_p()) |
1872 | finish_filelist_progress(flist); | |
31b4d25d | 1873 | |
134f4338 WD |
1874 | gettimeofday(&end_tv, NULL); |
1875 | stats.flist_xfertime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000 | |
1876 | + (end_tv.tv_usec - start_tv.tv_usec) / 1000; | |
ebed4c3a | 1877 | |
332cf6df WD |
1878 | /* When converting names, both sides keep an unsorted file-list array |
1879 | * because the names will differ on the sending and receiving sides | |
1880 | * (both sides will use the unsorted index number for each item). */ | |
1881 | ||
a6e7b978 WD |
1882 | /* Sort the list without removing any duplicates. This allows the |
1883 | * receiving side to ask for whatever name it kept. For incremental | |
1884 | * recursion mode, the sender marks duplicate dirs so that it can | |
1885 | * send them together in a single file-list. */ | |
332cf6df WD |
1886 | #ifdef ICONV_OPTION |
1887 | if (need_unsorted_flist) { | |
1888 | if (inc_recurse) { | |
9decb4d2 | 1889 | if (!(flist->sorted = new_array(struct file_struct *, flist->used))) |
a6e7b978 | 1890 | out_of_memory("send_file_list"); |
332cf6df | 1891 | memcpy(flist->sorted, flist->files, |
9decb4d2 | 1892 | flist->used * sizeof (struct file_struct*)); |
a6e7b978 | 1893 | clean_flist(flist, 0); |
9decb4d2 | 1894 | } else { |
a6e7b978 | 1895 | flist->sorted = flist->files; |
9decb4d2 WD |
1896 | flist->low = 0; |
1897 | flist->high = flist->used - 1; | |
1898 | } | |
332cf6df WD |
1899 | } else |
1900 | #endif | |
1901 | { | |
1902 | flist->sorted = flist->files; | |
a6e7b978 | 1903 | clean_flist(flist, 0); |
332cf6df | 1904 | } |
9decb4d2 | 1905 | file_total += flist->used; |
ebed4c3a | 1906 | |
5459e693 WD |
1907 | /* We don't subtract dir_count for the first send since we |
1908 | * might have one or more dot dirs which need to get sent. */ | |
1909 | flist->ndx_end = flist->ndx_start + flist->used - 1; | |
1910 | ||
3ea6e0e7 | 1911 | if (!numeric_ids && !inc_recurse) |
1564cd5a | 1912 | send_id_list(f); |
f6c34742 | 1913 | |
134f4338 | 1914 | /* send the io_error flag */ |
c7e6f84f WD |
1915 | if (protocol_version < 30) |
1916 | write_int(f, ignore_errors ? 0 : io_error); | |
1917 | else if (io_error && !ignore_errors) | |
1918 | send_msg_int(MSG_IO_ERROR, io_error); | |
1919 | ||
1920 | if (disable_buffering) | |
1921 | io_end_buffering_out(); | |
6ba9279f | 1922 | |
134f4338 | 1923 | stats.flist_size = stats.total_written - start_write; |
9decb4d2 | 1924 | stats.num_files = flist->used; |
d6dead6b | 1925 | |
cefed3e8 | 1926 | if (verbose > 3) |
32cbfe7b | 1927 | output_flist(flist); |
cefed3e8 | 1928 | |
17faa41c | 1929 | if (verbose > 2) |
ebed4c3a | 1930 | rprintf(FINFO, "send_file_list done\n"); |
17faa41c | 1931 | |
3ea6e0e7 | 1932 | if (inc_recurse) { |
8ea07c00 | 1933 | add_dirs_to_tree(-1, flist, dir_count); |
abdcb21a | 1934 | flist_done_allocating(flist); |
25c2a6ac WD |
1935 | if (send_dir_ndx < 0) { |
1936 | write_ndx(f, NDX_FLIST_EOF); | |
1937 | flist_eof = 1; | |
1938 | } | |
1939 | else if (file_total == 1) { | |
c7e6f84f WD |
1940 | /* If we're creating incremental file-lists and there |
1941 | * was just 1 item in the first file-list, send 1 more | |
1942 | * file-list to check if this is a 1-file xfer. */ | |
25c2a6ac | 1943 | send_extra_file_list(f, 1); |
c7e6f84f WD |
1944 | } |
1945 | } | |
1946 | ||
649d65ed | 1947 | return flist; |
c627d613 AT |
1948 | } |
1949 | ||
c627d613 AT |
1950 | struct file_list *recv_file_list(int f) |
1951 | { | |
ebed4c3a | 1952 | struct file_list *flist; |
c7e6f84f | 1953 | int dstart, flags; |
ebed4c3a | 1954 | int64 start_read; |
c627d613 | 1955 | |
98b1689d | 1956 | if (!first_flist) |
c7e6f84f | 1957 | rprintf(FLOG, "receiving file list\n"); |
1bbd10fe DD |
1958 | if (show_filelist_p()) |
1959 | start_filelist_progress("receiving file list"); | |
3ea6e0e7 | 1960 | else if (inc_recurse && verbose && !am_server && !first_flist) |
98b1689d | 1961 | rprintf(FCLIENT, "receiving incremental file list\n"); |
c627d613 | 1962 | |
ebed4c3a | 1963 | start_read = stats.total_read; |
a800434a | 1964 | |
c7e6f84f | 1965 | flist = flist_new(0, "recv_file_list"); |
c627d613 | 1966 | |
8cae71eb WD |
1967 | #ifdef SUPPORT_HARD_LINKS |
1968 | if (preserve_hard_links && protocol_version < 30) | |
1969 | init_hard_links(); | |
1970 | #endif | |
c627d613 | 1971 | |
3ea6e0e7 | 1972 | if (inc_recurse) { |
c7e6f84f WD |
1973 | if (flist->ndx_start == 0) |
1974 | dir_flist = flist_new(FLIST_TEMP, "recv_file_list"); | |
9decb4d2 | 1975 | dstart = dir_flist->used; |
c7e6f84f WD |
1976 | } else { |
1977 | dir_flist = flist; | |
1978 | dstart = 0; | |
1979 | } | |
1980 | ||
1ef00d20 | 1981 | while ((flags = read_byte(f)) != 0) { |
f5db0993 | 1982 | struct file_struct *file; |
dbda5fbf | 1983 | |
8ea07c00 | 1984 | flist_expand(flist, 1); |
c627d613 | 1985 | |
d01d15e0 | 1986 | if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS)) |
75bc8600 | 1987 | flags |= read_byte(f) << 8; |
82ad07c4 | 1988 | file = recv_file_entry(flist, flags, f); |
c627d613 | 1989 | |
3ea6e0e7 | 1990 | if (inc_recurse && S_ISDIR(file->mode)) { |
8ea07c00 | 1991 | flist_expand(dir_flist, 1); |
9decb4d2 | 1992 | dir_flist->files[dir_flist->used++] = file; |
c7e6f84f WD |
1993 | } |
1994 | ||
9decb4d2 | 1995 | flist->files[flist->used++] = file; |
c627d613 | 1996 | |
9decb4d2 | 1997 | maybe_emit_filelist_progress(flist->used); |
1bbd10fe | 1998 | |
5e4ff5f9 WD |
1999 | if (verbose > 2) { |
2000 | rprintf(FINFO, "recv_file_name(%s)\n", | |
2001 | f_name(file, NULL)); | |
2002 | } | |
ebed4c3a | 2003 | } |
9decb4d2 | 2004 | file_total += flist->used; |
c627d613 | 2005 | |
5459e693 WD |
2006 | flist->ndx_end = flist->ndx_start + flist->used - 1; |
2007 | if (inc_recurse && flist->ndx_start) | |
2008 | flist->ndx_end -= dir_flist->used - dstart; | |
2009 | ||
ebed4c3a | 2010 | if (verbose > 2) |
9decb4d2 | 2011 | rprintf(FINFO, "received %d names\n", flist->used); |
c627d613 | 2012 | |
b7736c79 | 2013 | if (show_filelist_p()) |
1bbd10fe | 2014 | finish_filelist_progress(flist); |
a06d19e3 | 2015 | |
332cf6df WD |
2016 | #ifdef ICONV_OPTION |
2017 | if (need_unsorted_flist) { | |
2018 | /* Create an extra array of index pointers that we can sort for | |
2019 | * the generator's use (for wading through the files in sorted | |
2020 | * order and for calling flist_find()). We keep the "files" | |
2021 | * list unsorted for our exchange of index numbers with the | |
2022 | * other side (since their names may not sort the same). */ | |
9decb4d2 | 2023 | if (!(flist->sorted = new_array(struct file_struct *, flist->used))) |
332cf6df WD |
2024 | out_of_memory("recv_file_list"); |
2025 | memcpy(flist->sorted, flist->files, | |
9decb4d2 WD |
2026 | flist->used * sizeof (struct file_struct*)); |
2027 | if (inc_recurse && dir_flist->used > dstart) { | |
8ea07c00 WD |
2028 | dir_flist->sorted = realloc_array(dir_flist->sorted, |
2029 | struct file_struct *, | |
9decb4d2 | 2030 | dir_flist->used); |
8ea07c00 | 2031 | memcpy(dir_flist->sorted + dstart, dir_flist->files + dstart, |
9decb4d2 WD |
2032 | (dir_flist->used - dstart) * sizeof (struct file_struct*)); |
2033 | fsort(dir_flist->sorted + dstart, dir_flist->used - dstart); | |
a6e7b978 | 2034 | } |
332cf6df WD |
2035 | } else |
2036 | #endif | |
a6e7b978 | 2037 | { |
332cf6df | 2038 | flist->sorted = flist->files; |
9decb4d2 | 2039 | if (inc_recurse && dir_flist->used > dstart) { |
a6e7b978 | 2040 | dir_flist->sorted = dir_flist->files; |
9decb4d2 | 2041 | fsort(dir_flist->sorted + dstart, dir_flist->used - dstart); |
a6e7b978 WD |
2042 | } |
2043 | } | |
332cf6df | 2044 | |
abdcb21a WD |
2045 | if (inc_recurse) |
2046 | flist_done_allocating(flist); | |
2047 | else if (f >= 0) | |
1564cd5a | 2048 | recv_id_list(f, flist); |
f6c34742 | 2049 | |
a6e7b978 WD |
2050 | clean_flist(flist, relative_paths); |
2051 | ||
c7e6f84f | 2052 | if (protocol_version < 30) { |
b9f592fb | 2053 | /* Recv the io_error flag */ |
1f56188f | 2054 | if (ignore_errors) |
b9f592fb WD |
2055 | read_int(f); |
2056 | else | |
2057 | io_error |= read_int(f); | |
ebed4c3a | 2058 | } |
6ba9279f | 2059 | |
cefed3e8 | 2060 | if (verbose > 3) |
32cbfe7b | 2061 | output_flist(flist); |
cefed3e8 | 2062 | |
ebed4c3a MP |
2063 | if (list_only) { |
2064 | int i; | |
9decb4d2 | 2065 | for (i = flist->low; i <= flist->high; i++) |
ebed4c3a | 2066 | list_file_entry(flist->files[i]); |
ebed4c3a | 2067 | } |
f7632fc6 | 2068 | |
ebed4c3a MP |
2069 | if (verbose > 2) |
2070 | rprintf(FINFO, "recv_file_list done\n"); | |
17faa41c | 2071 | |
c7e6f84f | 2072 | stats.flist_size += stats.total_read - start_read; |
9decb4d2 | 2073 | stats.num_files += flist->used; |
a800434a | 2074 | |
ebed4c3a | 2075 | return flist; |
c627d613 AT |
2076 | } |
2077 | ||
c7e6f84f WD |
2078 | /* This is only used once by the receiver if the very first file-list |
2079 | * has exactly one item in it. */ | |
2080 | void recv_additional_file_list(int f) | |
c627d613 | 2081 | { |
c7e6f84f | 2082 | struct file_list *flist; |
9ae7a2cd | 2083 | int ndx = read_ndx(f); |
25c2a6ac | 2084 | if (ndx == NDX_FLIST_EOF) { |
c7e6f84f WD |
2085 | flist_eof = 1; |
2086 | change_local_filter_dir(NULL, 0, 0); | |
2087 | } else { | |
2088 | ndx = NDX_FLIST_OFFSET - ndx; | |
9decb4d2 | 2089 | if (ndx < 0 || ndx >= dir_flist->used) { |
c7e6f84f WD |
2090 | ndx = NDX_FLIST_OFFSET - ndx; |
2091 | rprintf(FERROR, | |
8ea07c00 WD |
2092 | "[%s] Invalid dir index: %d (%d - %d)\n", |
2093 | who_am_i(), ndx, NDX_FLIST_OFFSET, | |
9decb4d2 | 2094 | NDX_FLIST_OFFSET - dir_flist->used + 1); |
c7e6f84f WD |
2095 | exit_cleanup(RERR_PROTOCOL); |
2096 | } | |
1faa1a6d WD |
2097 | if (verbose > 3) { |
2098 | rprintf(FINFO, "[%s] receiving flist for dir %d\n", | |
2099 | who_am_i(), ndx); | |
2100 | } | |
c7e6f84f WD |
2101 | flist = recv_file_list(f); |
2102 | flist->parent_ndx = ndx; | |
2103 | } | |
c627d613 AT |
2104 | } |
2105 | ||
f5db0993 WD |
2106 | /* Search for an identically-named item in the file list. Note that the |
2107 | * items must agree in their directory-ness, or no match is returned. */ | |
2f3cad89 | 2108 | int flist_find(struct file_list *flist, struct file_struct *f) |
c627d613 | 2109 | { |
f3c3ed44 | 2110 | int low = flist->low, high = flist->high; |
207522ae | 2111 | int diff, mid, mid_up; |
f3c3ed44 WD |
2112 | |
2113 | while (low <= high) { | |
2114 | mid = (low + high) / 2; | |
332cf6df | 2115 | if (F_IS_ACTIVE(flist->sorted[mid])) |
c0b134a4 | 2116 | mid_up = mid; |
7402d583 WD |
2117 | else { |
2118 | /* Scan for the next non-empty entry using the cached | |
2119 | * distance values. If the value isn't fully up-to- | |
2120 | * date, update it. */ | |
332cf6df WD |
2121 | mid_up = mid + F_DEPTH(flist->sorted[mid]); |
2122 | if (!F_IS_ACTIVE(flist->sorted[mid_up])) { | |
85aecef6 | 2123 | do { |
332cf6df WD |
2124 | mid_up += F_DEPTH(flist->sorted[mid_up]); |
2125 | } while (!F_IS_ACTIVE(flist->sorted[mid_up])); | |
2126 | F_DEPTH(flist->sorted[mid]) = mid_up - mid; | |
c0b134a4 | 2127 | } |
c0b134a4 | 2128 | if (mid_up > high) { |
7402d583 WD |
2129 | /* If there's nothing left above us, set high to |
2130 | * a non-empty entry below us and continue. */ | |
332cf6df WD |
2131 | high = mid - (int)flist->sorted[mid]->len32; |
2132 | if (!F_IS_ACTIVE(flist->sorted[high])) { | |
85aecef6 | 2133 | do { |
332cf6df WD |
2134 | high -= (int)flist->sorted[high]->len32; |
2135 | } while (!F_IS_ACTIVE(flist->sorted[high])); | |
2136 | flist->sorted[mid]->len32 = mid - high; | |
7402d583 | 2137 | } |
c0b134a4 WD |
2138 | continue; |
2139 | } | |
c0b134a4 | 2140 | } |
332cf6df | 2141 | diff = f_name_cmp(flist->sorted[mid_up], f); |
207522ae | 2142 | if (diff == 0) { |
f5db0993 | 2143 | if (protocol_version < 29 |
332cf6df | 2144 | && S_ISDIR(flist->sorted[mid_up]->mode) |
f5db0993 WD |
2145 | != S_ISDIR(f->mode)) |
2146 | return -1; | |
f3c3ed44 | 2147 | return mid_up; |
f5db0993 | 2148 | } |
207522ae | 2149 | if (diff < 0) |
f3c3ed44 | 2150 | low = mid_up + 1; |
207522ae WD |
2151 | else |
2152 | high = mid - 1; | |
d966ee25 | 2153 | } |
d966ee25 | 2154 | return -1; |
c627d613 AT |
2155 | } |
2156 | ||
3ec4dd97 | 2157 | /* |
9935066b S |
2158 | * Free up any resources a file_struct has allocated |
2159 | * and clear the file. | |
3ec4dd97 | 2160 | */ |
82ad07c4 | 2161 | void clear_file(struct file_struct *file) |
c627d613 | 2162 | { |
a3e18c76 WD |
2163 | /* The +1 zeros out the first char of the basename. */ |
2164 | memset(file, 0, FILE_STRUCT_LEN + 1); | |
9d737ecb | 2165 | /* In an empty entry, F_DEPTH() is an offset to the next non-empty |
96293cf9 | 2166 | * entry. Likewise for len32 in the opposite direction. We assume |
0679ac4c WD |
2167 | * that we're alone for now since flist_find() will adjust the counts |
2168 | * it runs into that aren't up-to-date. */ | |
9d737ecb | 2169 | file->len32 = F_DEPTH(file) = 1; |
3ec4dd97 | 2170 | } |
c627d613 | 2171 | |
4785cd43 | 2172 | /* Allocate a new file list. */ |
c7e6f84f | 2173 | struct file_list *flist_new(int flags, char *msg) |
3d382777 AT |
2174 | { |
2175 | struct file_list *flist; | |
2176 | ||
58cadc86 | 2177 | flist = new(struct file_list); |
ebed4c3a | 2178 | if (!flist) |
9935066b | 2179 | out_of_memory(msg); |
3d382777 | 2180 | |
82ad07c4 | 2181 | memset(flist, 0, sizeof flist[0]); |
9935066b | 2182 | |
abdcb21a WD |
2183 | if (flags & FLIST_TEMP) { |
2184 | if (!(flist->file_pool = pool_create(SMALL_EXTENT, 0, | |
2185 | out_of_memory, POOL_INTERN))) | |
2186 | out_of_memory(msg); | |
2187 | } else { | |
c7e6f84f WD |
2188 | /* This is a doubly linked list with prev looping back to |
2189 | * the end of the list, but the last next pointer is NULL. */ | |
abdcb21a WD |
2190 | if (!first_flist) { |
2191 | flist->file_pool = pool_create(NORMAL_EXTENT, 0, | |
2192 | out_of_memory, POOL_INTERN); | |
2193 | if (!flist->file_pool) | |
2194 | out_of_memory(msg); | |
2195 | ||
c7e6f84f | 2196 | first_flist = cur_flist = flist->prev = flist; |
abdcb21a WD |
2197 | } else { |
2198 | flist->file_pool = first_flist->file_pool; | |
2199 | ||
5459e693 | 2200 | flist->ndx_start = first_flist->prev->ndx_end + 2; |
abdcb21a | 2201 | |
c7e6f84f WD |
2202 | flist->prev = first_flist->prev; |
2203 | flist->prev->next = first_flist->prev = flist; | |
2204 | } | |
abdcb21a | 2205 | flist->pool_boundary = pool_boundary(flist->file_pool, 0); |
c7e6f84f WD |
2206 | flist_cnt++; |
2207 | } | |
2208 | ||
3d382777 AT |
2209 | return flist; |
2210 | } | |
ebed4c3a | 2211 | |
4785cd43 | 2212 | /* Free up all elements in a flist. */ |
3ec4dd97 AT |
2213 | void flist_free(struct file_list *flist) |
2214 | { | |
abdcb21a WD |
2215 | if (!flist->prev) { |
2216 | /* Was FLIST_TEMP dir-list. */ | |
2217 | } else if (flist == flist->prev) { | |
c7e6f84f WD |
2218 | first_flist = cur_flist = NULL; |
2219 | file_total = 0; | |
2220 | flist_cnt = 0; | |
2221 | } else { | |
2222 | if (flist == cur_flist) | |
2223 | cur_flist = flist->next; | |
2224 | if (flist == first_flist) | |
2225 | first_flist = first_flist->next; | |
2226 | else { | |
2227 | flist->prev->next = flist->next; | |
2228 | if (!flist->next) | |
2229 | flist->next = first_flist; | |
2230 | } | |
2231 | flist->next->prev = flist->prev; | |
9decb4d2 | 2232 | file_total -= flist->used; |
c7e6f84f WD |
2233 | flist_cnt--; |
2234 | } | |
2235 | ||
abdcb21a WD |
2236 | if (!flist->prev || !flist_cnt) |
2237 | pool_destroy(flist->file_pool); | |
2238 | else | |
2239 | pool_free_old(flist->file_pool, flist->pool_boundary); | |
2240 | ||
332cf6df WD |
2241 | if (flist->sorted && flist->sorted != flist->files) |
2242 | free(flist->sorted); | |
3ec4dd97 | 2243 | free(flist->files); |
3ec4dd97 | 2244 | free(flist); |
c627d613 AT |
2245 | } |
2246 | ||
a6e7b978 WD |
2247 | /* This routine ensures we don't have any duplicate names in our file list. |
2248 | * duplicate names can cause corruption because of the pipelining. */ | |
2249 | static void clean_flist(struct file_list *flist, int strip_root) | |
c627d613 | 2250 | { |
85aecef6 | 2251 | char fbuf[MAXPATHLEN]; |
a6e7b978 | 2252 | int i, prev_i; |
c627d613 | 2253 | |
910ee8c9 WD |
2254 | if (!flist) |
2255 | return; | |
9decb4d2 | 2256 | if (flist->used == 0) { |
910ee8c9 | 2257 | flist->high = -1; |
9decb4d2 | 2258 | flist->low = 0; |
3ec4dd97 | 2259 | return; |
910ee8c9 | 2260 | } |
3ec4dd97 | 2261 | |
9decb4d2 | 2262 | fsort(flist->sorted, flist->used); |
ebed4c3a | 2263 | |
a6e7b978 | 2264 | if (!am_sender || inc_recurse) { |
9decb4d2 | 2265 | for (i = prev_i = 0; i < flist->used; i++) { |
a6e7b978 WD |
2266 | if (F_IS_ACTIVE(flist->sorted[i])) { |
2267 | prev_i = i; | |
2268 | break; | |
2269 | } | |
b91b50c0 | 2270 | } |
a6e7b978 WD |
2271 | flist->low = prev_i; |
2272 | } else { | |
9decb4d2 | 2273 | i = prev_i = flist->used - 1; |
a6e7b978 | 2274 | flist->low = 0; |
b91b50c0 | 2275 | } |
a6e7b978 | 2276 | |
9decb4d2 | 2277 | while (++i < flist->used) { |
fe1c19dc | 2278 | int j; |
332cf6df | 2279 | struct file_struct *file = flist->sorted[i]; |
f5db0993 | 2280 | |
96293cf9 | 2281 | if (!F_IS_ACTIVE(file)) |
b91b50c0 | 2282 | continue; |
332cf6df | 2283 | if (f_name_cmp(file, flist->sorted[prev_i]) == 0) |
fe1c19dc WD |
2284 | j = prev_i; |
2285 | else if (protocol_version >= 29 && S_ISDIR(file->mode)) { | |
f5db0993 WD |
2286 | int save_mode = file->mode; |
2287 | /* Make sure that this directory doesn't duplicate a | |
2288 | * non-directory earlier in the list. */ | |
f5db0993 | 2289 | flist->high = prev_i; |
fe1c19dc WD |
2290 | file->mode = S_IFREG; |
2291 | j = flist_find(flist, file); | |
f5db0993 | 2292 | file->mode = save_mode; |
fe1c19dc WD |
2293 | } else |
2294 | j = -1; | |
2295 | if (j >= 0) { | |
fe1c19dc WD |
2296 | int keep, drop; |
2297 | /* If one is a dir and the other is not, we want to | |
2298 | * keep the dir because it might have contents in the | |
2299 | * list. */ | |
79028af1 WD |
2300 | if (S_ISDIR(file->mode)) { |
2301 | struct file_struct *fp = flist->sorted[j]; | |
2302 | if (!S_ISDIR(fp->mode)) | |
fe1c19dc WD |
2303 | keep = i, drop = j; |
2304 | else | |
2305 | keep = j, drop = i; | |
79028af1 | 2306 | } else |
fe1c19dc | 2307 | keep = j, drop = i; |
fe1c19dc | 2308 | |
a6e7b978 WD |
2309 | if (am_sender) |
2310 | flist->sorted[drop]->flags |= FLAG_DUPLICATE; | |
2311 | else { | |
2312 | if (verbose > 1) { | |
2313 | rprintf(FINFO, | |
2314 | "removing duplicate name %s from file list (%d)\n", | |
ee83e1bd | 2315 | f_name(file, fbuf), drop + flist->ndx_start); |
a6e7b978 WD |
2316 | } |
2317 | /* Make sure we don't lose track of a user-specified | |
2318 | * top directory. */ | |
2319 | flist->sorted[keep]->flags |= flist->sorted[drop]->flags | |
2320 | & (FLAG_TOP_DIR|FLAG_XFER_DIR); | |
2321 | ||
2322 | clear_file(flist->sorted[drop]); | |
2323 | } | |
9935066b | 2324 | |
fe1c19dc WD |
2325 | if (keep == i) { |
2326 | if (flist->low == drop) { | |
2327 | for (j = drop + 1; | |
332cf6df | 2328 | j < i && !F_IS_ACTIVE(flist->sorted[j]); |
fe1c19dc WD |
2329 | j++) {} |
2330 | flist->low = j; | |
2331 | } | |
2332 | prev_i = i; | |
2333 | } | |
728d0922 | 2334 | } else |
6931c138 | 2335 | prev_i = i; |
3ec4dd97 | 2336 | } |
a6e7b978 | 2337 | flist->high = prev_i; |
0199b05f | 2338 | |
c0b134a4 WD |
2339 | if (strip_root) { |
2340 | /* We need to strip off the leading slashes for relative | |
2341 | * paths, but this must be done _after_ the sorting phase. */ | |
2342 | for (i = flist->low; i <= flist->high; i++) { | |
332cf6df | 2343 | struct file_struct *file = flist->sorted[i]; |
c0b134a4 WD |
2344 | |
2345 | if (!file->dirname) | |
2346 | continue; | |
2347 | while (*file->dirname == '/') | |
2348 | file->dirname++; | |
2349 | if (!*file->dirname) | |
2350 | file->dirname = NULL; | |
2351 | } | |
2352 | } | |
2353 | ||
a6e7b978 | 2354 | if (prune_empty_dirs && !am_sender) { |
e6ffb966 | 2355 | int j, prev_depth = 0; |
9c000f5e | 2356 | |
e6ffb966 | 2357 | prev_i = 0; /* It's OK that this isn't really true. */ |
9c000f5e | 2358 | |
f5db0993 | 2359 | for (i = flist->low; i <= flist->high; i++) { |
332cf6df | 2360 | struct file_struct *fp, *file = flist->sorted[i]; |
ebed4c3a | 2361 | |
9d737ecb | 2362 | /* This temporarily abuses the F_DEPTH() value for a |
e6ffb966 WD |
2363 | * directory that is in a chain that might get pruned. |
2364 | * We restore the old value if it gets a reprieve. */ | |
9d737ecb | 2365 | if (S_ISDIR(file->mode) && F_DEPTH(file)) { |
e6ffb966 | 2366 | /* Dump empty dirs when coming back down. */ |
9d737ecb | 2367 | for (j = prev_depth; j >= F_DEPTH(file); j--) { |
332cf6df | 2368 | fp = flist->sorted[prev_i]; |
9d737ecb | 2369 | if (F_DEPTH(fp) >= 0) |
e6ffb966 | 2370 | break; |
9d737ecb | 2371 | prev_i = -F_DEPTH(fp)-1; |
82ad07c4 | 2372 | clear_file(fp); |
9c000f5e | 2373 | } |
9d737ecb | 2374 | prev_depth = F_DEPTH(file); |
85aecef6 WD |
2375 | if (is_excluded(f_name(file, fbuf), 1, |
2376 | ALL_FILTERS)) { | |
e6ffb966 WD |
2377 | /* Keep dirs through this dir. */ |
2378 | for (j = prev_depth-1; ; j--) { | |
332cf6df | 2379 | fp = flist->sorted[prev_i]; |
9d737ecb | 2380 | if (F_DEPTH(fp) >= 0) |
e6ffb966 | 2381 | break; |
9d737ecb WD |
2382 | prev_i = -F_DEPTH(fp)-1; |
2383 | F_DEPTH(fp) = j; | |
e6ffb966 | 2384 | } |
85aecef6 | 2385 | } else |
9d737ecb | 2386 | F_DEPTH(file) = -prev_i-1; |
e6ffb966 WD |
2387 | prev_i = i; |
2388 | } else { | |
2389 | /* Keep dirs through this non-dir. */ | |
2390 | for (j = prev_depth; ; j--) { | |
332cf6df | 2391 | fp = flist->sorted[prev_i]; |
9d737ecb | 2392 | if (F_DEPTH(fp) >= 0) |
e6ffb966 | 2393 | break; |
9d737ecb WD |
2394 | prev_i = -F_DEPTH(fp)-1; |
2395 | F_DEPTH(fp) = j; | |
e6ffb966 | 2396 | } |
0199b05f | 2397 | } |
9c000f5e | 2398 | } |
ca947dea | 2399 | /* Dump all remaining empty dirs. */ |
e6ffb966 | 2400 | while (1) { |
332cf6df | 2401 | struct file_struct *fp = flist->sorted[prev_i]; |
9d737ecb | 2402 | if (F_DEPTH(fp) >= 0) |
e6ffb966 | 2403 | break; |
9d737ecb | 2404 | prev_i = -F_DEPTH(fp)-1; |
82ad07c4 | 2405 | clear_file(fp); |
9c000f5e | 2406 | } |
f5db0993 | 2407 | |
9c000f5e | 2408 | for (i = flist->low; i <= flist->high; i++) { |
332cf6df | 2409 | if (F_IS_ACTIVE(flist->sorted[i])) |
9c000f5e WD |
2410 | break; |
2411 | } | |
2412 | flist->low = i; | |
2413 | for (i = flist->high; i >= flist->low; i--) { | |
332cf6df | 2414 | if (F_IS_ACTIVE(flist->sorted[i])) |
9c000f5e | 2415 | break; |
0199b05f | 2416 | } |
9c000f5e | 2417 | flist->high = i; |
0199b05f | 2418 | } |
cefed3e8 | 2419 | } |
0199b05f | 2420 | |
32cbfe7b | 2421 | static void output_flist(struct file_list *flist) |
cefed3e8 | 2422 | { |
f3c3ed44 | 2423 | char uidbuf[16], gidbuf[16], depthbuf[16]; |
cefed3e8 | 2424 | struct file_struct *file; |
9d737ecb | 2425 | const char *root, *dir, *slash, *name, *trail; |
32cbfe7b | 2426 | const char *who = who_am_i(); |
cefed3e8 | 2427 | int i; |
0199b05f | 2428 | |
5459e693 WD |
2429 | rprintf(FINFO, "[%s] flist start=%d, end=%d, used=%d, low=%d, high=%d\n", |
2430 | who, flist->ndx_start, flist->ndx_end, flist->used, flist->low, flist->high); | |
9decb4d2 | 2431 | for (i = 0; i < flist->used; i++) { |
a6e7b978 | 2432 | file = flist->sorted[i]; |
9b25ef35 | 2433 | if ((am_root || am_sender) && uid_ndx) { |
1564cd5a WD |
2434 | snprintf(uidbuf, sizeof uidbuf, " uid=%u", |
2435 | F_OWNER(file)); | |
82ad07c4 | 2436 | } else |
f05f993e | 2437 | *uidbuf = '\0'; |
9b25ef35 | 2438 | if (gid_ndx) { |
1564cd5a WD |
2439 | static char parens[] = "(\0)\0\0\0"; |
2440 | char *pp = parens + (file->flags & FLAG_SKIP_GROUP ? 0 : 3); | |
2441 | snprintf(gidbuf, sizeof gidbuf, " gid=%s%u%s", | |
2442 | pp, F_GROUP(file), pp + 2); | |
82ad07c4 | 2443 | } else |
f05f993e | 2444 | *gidbuf = '\0'; |
f3c3ed44 | 2445 | if (!am_sender) |
9d737ecb | 2446 | snprintf(depthbuf, sizeof depthbuf, "%d", F_DEPTH(file)); |
96293cf9 | 2447 | if (F_IS_ACTIVE(file)) { |
ef35abb2 | 2448 | root = am_sender ? NS(F_PATHNAME(file)) : depthbuf; |
96293cf9 WD |
2449 | if ((dir = file->dirname) == NULL) |
2450 | dir = slash = ""; | |
2451 | else | |
2452 | slash = "/"; | |
c58c1dc4 | 2453 | name = file->basename; |
96293cf9 WD |
2454 | trail = S_ISDIR(file->mode) ? "/" : ""; |
2455 | } else | |
9d737ecb | 2456 | root = dir = slash = name = trail = ""; |
ee83e1bd WD |
2457 | rprintf(FINFO, |
2458 | "[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n", | |
2459 | who, i + flist->ndx_start, | |
2460 | root, dir, slash, name, trail, | |
2461 | (int)file->mode, (double)F_LENGTH(file), | |
2462 | uidbuf, gidbuf, file->flags); | |
0199b05f | 2463 | } |
3ec4dd97 AT |
2464 | } |
2465 | ||
8824e2ce | 2466 | enum fnc_state { s_DIR, s_SLASH, s_BASE, s_TRAILING }; |
f5db0993 | 2467 | enum fnc_type { t_PATH, t_ITEM }; |
8018edd3 | 2468 | |
569e6f43 WD |
2469 | static int found_prefix; |
2470 | ||
2f3cad89 | 2471 | /* Compare the names of two file_struct entities, similar to how strcmp() |
f5db0993 WD |
2472 | * would do if it were operating on the joined strings. |
2473 | * | |
2474 | * Some differences beginning with protocol_version 29: (1) directory names | |
2475 | * are compared with an assumed trailing slash so that they compare in a | |
2476 | * way that would cause them to sort immediately prior to any content they | |
2477 | * may have; (2) a directory of any name compares after a non-directory of | |
2478 | * any name at the same depth; (3) a directory with name "." compares prior | |
2479 | * to anything else. These changes mean that a directory and a non-dir | |
2480 | * with the same name will not compare as equal (protocol_version >= 29). | |
2481 | * | |
2482 | * The dirname component can be an empty string, but the basename component | |
2483 | * cannot (and never is in the current codebase). The basename component | |
2484 | * may be NULL (for a removed item), in which case it is considered to be | |
2485 | * after any existing item. */ | |
569e6f43 | 2486 | int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2) |
3ec4dd97 | 2487 | { |
8018edd3 WD |
2488 | int dif; |
2489 | const uchar *c1, *c2; | |
1ef00d20 | 2490 | enum fnc_state state1, state2; |
f5db0993 WD |
2491 | enum fnc_type type1, type2; |
2492 | enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM; | |
8018edd3 | 2493 | |
96293cf9 WD |
2494 | if (!f1 || !F_IS_ACTIVE(f1)) { |
2495 | if (!f2 || !F_IS_ACTIVE(f2)) | |
8018edd3 WD |
2496 | return 0; |
2497 | return -1; | |
2498 | } | |
96293cf9 | 2499 | if (!f2 || !F_IS_ACTIVE(f2)) |
8018edd3 WD |
2500 | return 1; |
2501 | ||
14698a3a WD |
2502 | c1 = (uchar*)f1->dirname; |
2503 | c2 = (uchar*)f2->dirname; | |
2504 | if (c1 == c2) | |
2505 | c1 = c2 = NULL; | |
2506 | if (!c1) { | |
f5db0993 | 2507 | type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM; |
c58c1dc4 | 2508 | c1 = (const uchar*)f1->basename; |
f5db0993 WD |
2509 | if (type1 == t_PATH && *c1 == '.' && !c1[1]) { |
2510 | type1 = t_ITEM; | |
2511 | state1 = s_TRAILING; | |
2512 | c1 = (uchar*)""; | |
2513 | } else | |
2514 | state1 = s_BASE; | |
f5db0993 WD |
2515 | } else { |
2516 | type1 = t_path; | |
8824e2ce | 2517 | state1 = s_DIR; |
f5db0993 | 2518 | } |
14698a3a | 2519 | if (!c2) { |
f5db0993 | 2520 | type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM; |
c58c1dc4 | 2521 | c2 = (const uchar*)f2->basename; |
f5db0993 WD |
2522 | if (type2 == t_PATH && *c2 == '.' && !c2[1]) { |
2523 | type2 = t_ITEM; | |
2524 | state2 = s_TRAILING; | |
2525 | c2 = (uchar*)""; | |
2526 | } else | |
2527 | state2 = s_BASE; | |
f5db0993 WD |
2528 | } else { |
2529 | type2 = t_path; | |
8824e2ce | 2530 | state2 = s_DIR; |
f5db0993 WD |
2531 | } |
2532 | ||
2533 | if (type1 != type2) | |
2534 | return type1 == t_PATH ? 1 : -1; | |
8018edd3 | 2535 | |
e4fdf1de | 2536 | do { |
f5db0993 | 2537 | if (!*c1) { |
8018edd3 | 2538 | switch (state1) { |
8824e2ce WD |
2539 | case s_DIR: |
2540 | state1 = s_SLASH; | |
e90b8ace | 2541 | c1 = (uchar*)"/"; |
8018edd3 | 2542 | break; |
8824e2ce | 2543 | case s_SLASH: |
f5db0993 | 2544 | type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM; |
c58c1dc4 | 2545 | c1 = (const uchar*)f1->basename; |
cbb5fa4f WD |
2546 | if (type1 == t_PATH && *c1 == '.' && !c1[1]) { |
2547 | type1 = t_ITEM; | |
2548 | state1 = s_TRAILING; | |
2549 | c1 = (uchar*)""; | |
2550 | } else | |
2551 | state1 = s_BASE; | |
8018edd3 | 2552 | break; |
8824e2ce WD |
2553 | case s_BASE: |
2554 | state1 = s_TRAILING; | |
f5db0993 | 2555 | if (type1 == t_PATH) { |
2f3cad89 | 2556 | c1 = (uchar*)"/"; |
f5db0993 WD |
2557 | break; |
2558 | } | |
2559 | /* FALL THROUGH */ | |
8824e2ce | 2560 | case s_TRAILING: |
f5db0993 | 2561 | type1 = t_ITEM; |
8018edd3 WD |
2562 | break; |
2563 | } | |
f5db0993 WD |
2564 | if (*c2 && type1 != type2) |
2565 | return type1 == t_PATH ? 1 : -1; | |
8018edd3 | 2566 | } |
f5db0993 | 2567 | if (!*c2) { |
8018edd3 | 2568 | switch (state2) { |
8824e2ce WD |
2569 | case s_DIR: |
2570 | state2 = s_SLASH; | |
e90b8ace | 2571 | c2 = (uchar*)"/"; |
8018edd3 | 2572 | break; |
8824e2ce | 2573 | case s_SLASH: |
f5db0993 | 2574 | type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM; |
c58c1dc4 | 2575 | c2 = (const uchar*)f2->basename; |
cbb5fa4f WD |
2576 | if (type2 == t_PATH && *c2 == '.' && !c2[1]) { |
2577 | type2 = t_ITEM; | |
2578 | state2 = s_TRAILING; | |
2579 | c2 = (uchar*)""; | |
2580 | } else | |
2581 | state2 = s_BASE; | |
8018edd3 | 2582 | break; |
8824e2ce | 2583 | case s_BASE: |
8824e2ce | 2584 | state2 = s_TRAILING; |
f5db0993 | 2585 | if (type2 == t_PATH) { |
2f3cad89 | 2586 | c2 = (uchar*)"/"; |
f5db0993 WD |
2587 | break; |
2588 | } | |
2589 | /* FALL THROUGH */ | |
8824e2ce | 2590 | case s_TRAILING: |
569e6f43 | 2591 | found_prefix = 1; |
f5db0993 WD |
2592 | if (!*c1) |
2593 | return 0; | |
2594 | type2 = t_ITEM; | |
8018edd3 WD |
2595 | break; |
2596 | } | |
f5db0993 WD |
2597 | if (type1 != type2) |
2598 | return type1 == t_PATH ? 1 : -1; | |
8018edd3 | 2599 | } |
e4fdf1de | 2600 | } while ((dif = (int)*c1++ - (int)*c2++) == 0); |
8018edd3 WD |
2601 | |
2602 | return dif; | |
2603 | } | |
2604 | ||
569e6f43 WD |
2605 | /* Returns 1 if f1's filename has all of f2's filename as a prefix. This does |
2606 | * not match if f2's basename is not an exact match of a path element in f1. | |
2607 | * E.g. /path/foo is not a prefix of /path/foobar/baz, but /path/foobar is. */ | |
2608 | int f_name_has_prefix(const struct file_struct *f1, const struct file_struct *f2) | |
2609 | { | |
2610 | found_prefix = 0; | |
2611 | f_name_cmp(f1, f2); | |
2612 | return found_prefix; | |
2613 | } | |
2614 | ||
96293cf9 WD |
2615 | char *f_name_buf(void) |
2616 | { | |
2617 | static char names[5][MAXPATHLEN]; | |
2618 | static unsigned int n; | |
2619 | ||
2620 | n = (n + 1) % (sizeof names / sizeof names[0]); | |
2621 | ||
2622 | return names[n]; | |
2623 | } | |
2624 | ||
8018edd3 | 2625 | /* Return a copy of the full filename of a flist entry, using the indicated |
5e4ff5f9 WD |
2626 | * buffer or one of 5 static buffers if fbuf is NULL. No size-checking is |
2627 | * done because we checked the size when creating the file_struct entry. | |
8018edd3 | 2628 | */ |
569e6f43 | 2629 | char *f_name(const struct file_struct *f, char *fbuf) |
8018edd3 | 2630 | { |
96293cf9 | 2631 | if (!f || !F_IS_ACTIVE(f)) |
ebed4c3a | 2632 | return NULL; |
3ec4dd97 | 2633 | |
96293cf9 WD |
2634 | if (!fbuf) |
2635 | fbuf = f_name_buf(); | |
5e4ff5f9 | 2636 | |
3ec4dd97 | 2637 | if (f->dirname) { |
882e6893 WD |
2638 | int len = strlen(f->dirname); |
2639 | memcpy(fbuf, f->dirname, len); | |
2640 | fbuf[len] = '/'; | |
c58c1dc4 | 2641 | strlcpy(fbuf + len + 1, f->basename, MAXPATHLEN - (len + 1)); |
8018edd3 | 2642 | } else |
c58c1dc4 | 2643 | strlcpy(fbuf, f->basename, MAXPATHLEN); |
0ee6ca98 | 2644 | |
b7736c79 | 2645 | return fbuf; |
8018edd3 | 2646 | } |
e03dfae5 | 2647 | |
32cbfe7b WD |
2648 | /* Do a non-recursive scan of the named directory, possibly ignoring all |
2649 | * exclude rules except for the daemon's. If "dlen" is >=0, it is the length | |
2650 | * of the dirname string, and also indicates that "dirname" is a MAXPATHLEN | |
2651 | * buffer (the functions we call will append names onto the end, but the old | |
2652 | * dir value will be restored on exit). */ | |
263d3bfb | 2653 | struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules) |
37802f40 WD |
2654 | { |
2655 | struct file_list *dirlist; | |
2656 | char dirbuf[MAXPATHLEN]; | |
37802f40 | 2657 | int save_recurse = recurse; |
1661fe9b | 2658 | int save_xfer_dirs = xfer_dirs; |
4635fb99 | 2659 | int save_prune_empty_dirs = prune_empty_dirs; |
37802f40 | 2660 | |
32cbfe7b WD |
2661 | if (dlen < 0) { |
2662 | dlen = strlcpy(dirbuf, dirname, MAXPATHLEN); | |
2663 | if (dlen >= MAXPATHLEN) | |
2664 | return NULL; | |
2665 | dirname = dirbuf; | |
2666 | } | |
37802f40 | 2667 | |
c7e6f84f | 2668 | dirlist = flist_new(FLIST_TEMP, "get_dirlist"); |
32cbfe7b | 2669 | |
37802f40 | 2670 | recurse = 0; |
1661fe9b | 2671 | xfer_dirs = 1; |
a6e7b978 | 2672 | send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen, 0); |
1661fe9b | 2673 | xfer_dirs = save_xfer_dirs; |
37802f40 | 2674 | recurse = save_recurse; |
53135fe8 | 2675 | if (do_progress) |
9decb4d2 | 2676 | flist_count_offset += dirlist->used; |
37802f40 | 2677 | |
4635fb99 | 2678 | prune_empty_dirs = 0; |
332cf6df | 2679 | dirlist->sorted = dirlist->files; |
a6e7b978 | 2680 | clean_flist(dirlist, 0); |
4635fb99 | 2681 | prune_empty_dirs = save_prune_empty_dirs; |
564ef546 | 2682 | |
45478cc7 | 2683 | if (verbose > 3) |
32cbfe7b | 2684 | output_flist(dirlist); |
45478cc7 | 2685 | |
32cbfe7b | 2686 | return dirlist; |
45478cc7 | 2687 | } |