Commit | Line | Data |
---|---|---|
dbda5fbf | 1 | /* |
c627d613 AT |
2 | Copyright (C) Andrew Tridgell 1996 |
3 | Copyright (C) Paul Mackerras 1996 | |
736a6a29 | 4 | Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org> |
dbda5fbf | 5 | |
c627d613 AT |
6 | This program is free software; you can redistribute it and/or modify |
7 | it under the terms of the GNU General Public License as published by | |
8 | the Free Software Foundation; either version 2 of the License, or | |
9 | (at your option) any later version. | |
dbda5fbf | 10 | |
c627d613 AT |
11 | This program is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 | GNU General Public License for more details. | |
dbda5fbf | 15 | |
c627d613 AT |
16 | You should have received a copy of the GNU General Public License |
17 | along with this program; if not, write to the Free Software | |
18 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |
19 | */ | |
20 | ||
736a6a29 MP |
21 | /** @file flist.c |
22 | * Generate and receive file lists | |
23 | * | |
24 | * @todo Get rid of the string_area optimization. Efficiently | |
25 | * allocating blocks is the responsibility of the system's malloc | |
26 | * library, not of rsync. | |
27 | * | |
172875cf MP |
28 | * @sa http://lists.samba.org/pipermail/rsync/2000-June/002351.html |
29 | * | |
736a6a29 | 30 | **/ |
c627d613 AT |
31 | |
32 | #include "rsync.h" | |
33 | ||
a800434a AT |
34 | extern struct stats stats; |
35 | ||
c627d613 | 36 | extern int verbose; |
1bbd10fe | 37 | extern int do_progress; |
c627d613 AT |
38 | extern int am_server; |
39 | extern int always_checksum; | |
c627d613 AT |
40 | |
41 | extern int cvs_exclude; | |
42 | ||
a06d19e3 | 43 | extern int recurse; |
24d0fcde WD |
44 | extern char *files_from; |
45 | extern int filesfrom_fd; | |
a06d19e3 | 46 | |
c627d613 AT |
47 | extern int one_file_system; |
48 | extern int make_backups; | |
49 | extern int preserve_links; | |
dc5ddbcc | 50 | extern int preserve_hard_links; |
c627d613 AT |
51 | extern int preserve_perms; |
52 | extern int preserve_devices; | |
53 | extern int preserve_uid; | |
54 | extern int preserve_gid; | |
55 | extern int preserve_times; | |
6574b4f7 | 56 | extern int relative_paths; |
24d0fcde | 57 | extern int implied_dirs; |
82306bf6 | 58 | extern int copy_links; |
b5313607 | 59 | extern int copy_unsafe_links; |
d04e9c51 | 60 | extern int protocol_version; |
cb13abfe | 61 | extern int sanitize_paths; |
c627d613 | 62 | |
6902ed17 MP |
63 | extern int read_batch; |
64 | extern int write_batch; | |
65 | ||
429f9828 WD |
66 | extern struct exclude_struct **exclude_list; |
67 | extern struct exclude_struct **server_exclude_list; | |
68 | extern struct exclude_struct **local_exclude_list; | |
c627d613 | 69 | |
06c28400 WD |
70 | int io_error; |
71 | ||
3d382777 AT |
72 | static struct file_struct null_file; |
73 | ||
827c37f6 | 74 | static void clean_flist(struct file_list *flist, int strip_root, int no_dups); |
0199b05f | 75 | |
58225000 | 76 | |
1bbd10fe | 77 | static int show_filelist_p(void) |
58225000 | 78 | { |
24d0fcde | 79 | return verbose && (recurse || files_from) && !am_server; |
1bbd10fe | 80 | } |
ebed4c3a | 81 | |
1bbd10fe DD |
82 | static void start_filelist_progress(char *kind) |
83 | { | |
84 | rprintf(FINFO, "%s ... ", kind); | |
85 | if ((verbose > 1) || do_progress) | |
86 | rprintf(FINFO, "\n"); | |
87 | rflush(FINFO); | |
58225000 MP |
88 | } |
89 | ||
db719fb0 | 90 | |
d27cbec5 | 91 | static void emit_filelist_progress(const struct file_list *flist) |
db719fb0 | 92 | { |
d27cbec5 | 93 | rprintf(FINFO, " %d files...\r", flist->count); |
db719fb0 MP |
94 | } |
95 | ||
96 | ||
d27cbec5 | 97 | static void maybe_emit_filelist_progress(const struct file_list *flist) |
58225000 | 98 | { |
d27cbec5 DD |
99 | if (do_progress && show_filelist_p() && ((flist->count % 100) == 0)) |
100 | emit_filelist_progress(flist); | |
58225000 MP |
101 | } |
102 | ||
103 | ||
1bbd10fe | 104 | static void finish_filelist_progress(const struct file_list *flist) |
58225000 | 105 | { |
1bbd10fe DD |
106 | if (do_progress) { |
107 | /* This overwrites the progress line */ | |
c7b562be MP |
108 | rprintf(FINFO, "%d file%sto consider\n", |
109 | flist->count, flist->count == 1 ? " " : "s "); | |
b7736c79 | 110 | } else |
1bbd10fe | 111 | rprintf(FINFO, "done\n"); |
58225000 MP |
112 | } |
113 | ||
86943126 MP |
114 | void show_flist_stats(void) |
115 | { | |
116 | /* Nothing yet */ | |
117 | } | |
118 | ||
119 | ||
5c66303a | 120 | static struct string_area *string_area_new(int size) |
3d382777 AT |
121 | { |
122 | struct string_area *a; | |
123 | ||
ebed4c3a MP |
124 | if (size <= 0) |
125 | size = ARENA_SIZE; | |
58cadc86 | 126 | a = new(struct string_area); |
ebed4c3a MP |
127 | if (!a) |
128 | out_of_memory("string_area_new"); | |
58cadc86 | 129 | a->current = a->base = new_array(char, size); |
ebed4c3a MP |
130 | if (!a->current) |
131 | out_of_memory("string_area_new buffer"); | |
3d382777 | 132 | a->end = a->base + size; |
5c66303a | 133 | a->next = NULL; |
3d382777 AT |
134 | |
135 | return a; | |
136 | } | |
137 | ||
5c66303a | 138 | static void string_area_free(struct string_area *a) |
3d382777 AT |
139 | { |
140 | struct string_area *next; | |
141 | ||
ebed4c3a | 142 | for (; a; a = next) { |
3d382777 AT |
143 | next = a->next; |
144 | free(a->base); | |
145 | } | |
146 | } | |
147 | ||
5c66303a | 148 | static char *string_area_malloc(struct string_area **ap, int size) |
3d382777 AT |
149 | { |
150 | char *p; | |
151 | struct string_area *a; | |
152 | ||
153 | /* does the request fit into the current space? */ | |
154 | a = *ap; | |
155 | if (a->current + size >= a->end) { | |
156 | /* no; get space, move new string_area to front of the list */ | |
157 | a = string_area_new(size > ARENA_SIZE ? size : ARENA_SIZE); | |
158 | a->next = *ap; | |
159 | *ap = a; | |
160 | } | |
161 | ||
162 | /* have space; do the "allocation." */ | |
163 | p = a->current; | |
164 | a->current += size; | |
165 | return p; | |
166 | } | |
167 | ||
5c66303a | 168 | static char *string_area_strdup(struct string_area **ap, const char *src) |
3d382777 | 169 | { |
ebed4c3a | 170 | char *dest = string_area_malloc(ap, strlen(src) + 1); |
3d382777 AT |
171 | return strcpy(dest, src); |
172 | } | |
f7632fc6 AT |
173 | |
174 | static void list_file_entry(struct file_struct *f) | |
175 | { | |
740819ef | 176 | char perms[11]; |
f7632fc6 | 177 | |
7212be92 DD |
178 | if (!f->basename) |
179 | /* this can happen if duplicate names were removed */ | |
180 | return; | |
181 | ||
740819ef MP |
182 | permstring(perms, f->mode); |
183 | ||
f7632fc6 | 184 | if (preserve_links && S_ISLNK(f->mode)) { |
ebed4c3a MP |
185 | rprintf(FINFO, "%s %11.0f %s %s -> %s\n", |
186 | perms, | |
187 | (double) f->length, timestring(f->modtime), | |
f7632fc6 AT |
188 | f_name(f), f->link); |
189 | } else { | |
ebed4c3a MP |
190 | rprintf(FINFO, "%s %11.0f %s %s\n", |
191 | perms, | |
192 | (double) f->length, timestring(f->modtime), | |
193 | f_name(f)); | |
f7632fc6 AT |
194 | } |
195 | } | |
196 | ||
197 | ||
bd9e9ecc MP |
198 | /** |
199 | * Stat either a symlink or its referent, depending on the settings of | |
200 | * copy_links, copy_unsafe_links, etc. | |
201 | * | |
4e5db0ad MP |
202 | * @retval -1 on error |
203 | * | |
204 | * @retval 0 for success | |
205 | * | |
206 | * @post If @p path is a symlink, then @p linkbuf (of size @c | |
bd9e9ecc | 207 | * MAXPATHLEN) contains the symlink target. |
4e5db0ad MP |
208 | * |
209 | * @post @p buffer contains information about the link or the | |
210 | * referrent as appropriate, if they exist. | |
bd9e9ecc | 211 | **/ |
b7736c79 | 212 | int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf) |
b5313607 DD |
213 | { |
214 | #if SUPPORT_LINKS | |
b7736c79 | 215 | if (copy_links) |
6f2623fd | 216 | return do_stat(path, buffer); |
b7736c79 | 217 | if (do_lstat(path, buffer) == -1) |
b5313607 | 218 | return -1; |
6f2623fd | 219 | if (S_ISLNK(buffer->st_mode)) { |
b7736c79 | 220 | int l = readlink((char *) path, linkbuf, MAXPATHLEN - 1); |
dbda5fbf | 221 | if (l == -1) |
b5313607 | 222 | return -1; |
6f2623fd | 223 | linkbuf[l] = 0; |
fc638474 DD |
224 | if (copy_unsafe_links && unsafe_symlink(linkbuf, path)) { |
225 | if (verbose > 1) { | |
dbda5fbf | 226 | rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n", |
fc638474 DD |
227 | path, linkbuf); |
228 | } | |
6f2623fd | 229 | return do_stat(path, buffer); |
b5313607 DD |
230 | } |
231 | } | |
232 | return 0; | |
233 | #else | |
6f2623fd | 234 | return do_stat(path, buffer); |
b5313607 DD |
235 | #endif |
236 | } | |
237 | ||
6f2623fd | 238 | int link_stat(const char *path, STRUCT_STAT * buffer) |
82306bf6 AT |
239 | { |
240 | #if SUPPORT_LINKS | |
b7736c79 | 241 | if (copy_links) |
6f2623fd | 242 | return do_stat(path, buffer); |
b7736c79 | 243 | return do_lstat(path, buffer); |
82306bf6 | 244 | #else |
6f2623fd | 245 | return do_stat(path, buffer); |
82306bf6 AT |
246 | #endif |
247 | } | |
248 | ||
c627d613 | 249 | /* |
429f9828 WD |
250 | * This function is used to check if a file should be included/excluded |
251 | * from the list of files based on its name and type etc. The value of | |
252 | * exclude_level is set to either SERVER_EXCLUDES or ALL_EXCLUDES. | |
c627d613 | 253 | */ |
429f9828 | 254 | static int check_exclude_file(char *fname, int is_dir, int exclude_level) |
c627d613 | 255 | { |
7d687932 | 256 | #if 0 /* This currently never happens, so avoid a useless compare. */ |
429f9828 WD |
257 | if (exclude_level == NO_EXCLUDES) |
258 | return 0; | |
259 | #endif | |
6931c138 | 260 | if (fname) { |
429f9828 | 261 | /* never exclude '.', even if somebody does --exclude '*' */ |
6931c138 WD |
262 | if (fname[0] == '.' && !fname[1]) |
263 | return 0; | |
264 | /* Handle the -R version of the '.' dir. */ | |
265 | if (fname[0] == '/') { | |
266 | int len = strlen(fname); | |
267 | if (fname[len-1] == '.' && fname[len-2] == '/') | |
268 | return 0; | |
269 | } | |
76e26e10 | 270 | } |
6931c138 WD |
271 | if (server_exclude_list |
272 | && check_exclude(server_exclude_list, fname, is_dir)) | |
429f9828 WD |
273 | return 1; |
274 | if (exclude_level != ALL_EXCLUDES) | |
275 | return 0; | |
276 | if (exclude_list && check_exclude(exclude_list, fname, is_dir)) | |
277 | return 1; | |
6931c138 WD |
278 | if (local_exclude_list |
279 | && check_exclude(local_exclude_list, fname, is_dir)) | |
76e26e10 | 280 | return 1; |
76e26e10 | 281 | return 0; |
c627d613 AT |
282 | } |
283 | ||
284 | /* used by the one_file_system code */ | |
285 | static dev_t filesystem_dev; | |
286 | ||
287 | static void set_filesystem(char *fname) | |
288 | { | |
ebed4c3a MP |
289 | STRUCT_STAT st; |
290 | if (link_stat(fname, &st) != 0) | |
291 | return; | |
292 | filesystem_dev = st.st_dev; | |
c627d613 AT |
293 | } |
294 | ||
295 | ||
b280a1f4 AT |
296 | static int to_wire_mode(mode_t mode) |
297 | { | |
b7736c79 | 298 | if (S_ISLNK(mode) && (_S_IFLNK != 0120000)) |
b280a1f4 | 299 | return (mode & ~(_S_IFMT)) | 0120000; |
ebed4c3a | 300 | return (int) mode; |
b280a1f4 AT |
301 | } |
302 | ||
303 | static mode_t from_wire_mode(int mode) | |
304 | { | |
b7736c79 | 305 | if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000)) |
efe3037c | 306 | return (mode & ~(_S_IFMT)) | _S_IFLNK; |
ebed4c3a | 307 | return (mode_t) mode; |
b280a1f4 AT |
308 | } |
309 | ||
310 | ||
ebed4c3a | 311 | static void send_directory(int f, struct file_list *flist, char *dir); |
c627d613 | 312 | |
3a6a366f | 313 | static char *flist_dir; |
c627d613 | 314 | |
3ec4dd97 | 315 | |
d9d6bc52 MP |
316 | /** |
317 | * Make sure @p flist is big enough to hold at least @p flist->count | |
318 | * entries. | |
319 | **/ | |
320 | static void flist_expand(struct file_list *flist) | |
321 | { | |
322 | if (flist->count >= flist->malloced) { | |
2e7d1994 | 323 | void *new_ptr; |
dbda5fbf | 324 | |
d9d6bc52 MP |
325 | if (flist->malloced < 1000) |
326 | flist->malloced += 1000; | |
327 | else | |
328 | flist->malloced *= 2; | |
2e7d1994 | 329 | |
58cadc86 WD |
330 | if (flist->files) { |
331 | new_ptr = realloc_array(flist->files, | |
332 | struct file_struct *, | |
333 | flist->malloced); | |
334 | } else { | |
335 | new_ptr = new_array(struct file_struct *, | |
336 | flist->malloced); | |
337 | } | |
2e7d1994 | 338 | |
1d5a1da9 | 339 | if (verbose >= 2) { |
1bbd10fe | 340 | rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n", |
58cadc86 WD |
341 | (double)sizeof(flist->files[0]) |
342 | * flist->malloced, | |
2e7d1994 MP |
343 | (new_ptr == flist->files) ? " not" : ""); |
344 | } | |
dbda5fbf | 345 | |
2e7d1994 MP |
346 | flist->files = (struct file_struct **) new_ptr; |
347 | ||
d9d6bc52 MP |
348 | if (!flist->files) |
349 | out_of_memory("flist_expand"); | |
350 | } | |
351 | } | |
352 | ||
353 | ||
ebed4c3a | 354 | static void send_file_entry(struct file_struct *file, int f, |
1ef00d20 | 355 | unsigned short base_flags) |
c627d613 | 356 | { |
1ef00d20 | 357 | unsigned short flags; |
30f337c9 WD |
358 | static time_t modtime; |
359 | static mode_t mode; | |
dd7fb70f | 360 | static DEV64_T rdev; /* just high bytes after p28 */ |
30f337c9 WD |
361 | static uid_t uid; |
362 | static gid_t gid; | |
363 | static DEV64_T dev; | |
72914a60 | 364 | static char lastname[MAXPATHLEN]; |
b7736c79 | 365 | char *fname, fbuf[MAXPATHLEN]; |
ebed4c3a | 366 | int l1, l2; |
72914a60 | 367 | |
ebed4c3a MP |
368 | if (f == -1) |
369 | return; | |
72914a60 AT |
370 | |
371 | if (!file) { | |
ebed4c3a | 372 | write_byte(f, 0); |
72914a60 AT |
373 | return; |
374 | } | |
375 | ||
eca2adb4 MP |
376 | io_write_phase = "send_file_entry"; |
377 | ||
b7736c79 | 378 | fname = f_name_to(file, fbuf, sizeof fbuf); |
72914a60 AT |
379 | |
380 | flags = base_flags; | |
381 | ||
30f337c9 | 382 | if (file->mode == mode) |
ebed4c3a | 383 | flags |= SAME_MODE; |
1ef00d20 | 384 | else |
30f337c9 | 385 | mode = file->mode; |
75bc8600 WD |
386 | if (preserve_devices) { |
387 | if (protocol_version < 28) { | |
dd7fb70f | 388 | if (IS_DEVICE(mode) && file->rdev == rdev) { |
30f337c9 WD |
389 | /* Set both flags so that the test when |
390 | * writing the data is simpler. */ | |
391 | flags |= SAME_RDEV_pre28|SAME_HIGH_RDEV; | |
392 | } | |
75bc8600 | 393 | else |
dd7fb70f | 394 | rdev = file->rdev; |
75bc8600 | 395 | } |
30f337c9 | 396 | else if (IS_DEVICE(mode)) { |
dd7fb70f | 397 | if ((file->rdev & ~0xFF) == rdev) |
75bc8600 | 398 | flags |= SAME_HIGH_RDEV; |
30f337c9 | 399 | else |
dd7fb70f | 400 | rdev = file->rdev & ~0xFF; |
75bc8600 WD |
401 | } |
402 | } | |
30f337c9 | 403 | if (file->uid == uid) |
ebed4c3a | 404 | flags |= SAME_UID; |
1ef00d20 | 405 | else |
30f337c9 WD |
406 | uid = file->uid; |
407 | if (file->gid == gid) | |
ebed4c3a | 408 | flags |= SAME_GID; |
1ef00d20 | 409 | else |
30f337c9 WD |
410 | gid = file->gid; |
411 | if (file->modtime == modtime) | |
ebed4c3a | 412 | flags |= SAME_TIME; |
1ef00d20 | 413 | else |
30f337c9 | 414 | modtime = file->modtime; |
c4b4df4f | 415 | if (file->flags & HAS_INODE_DATA) { |
30f337c9 | 416 | if (file->dev == dev) { |
c4b4df4f WD |
417 | if (protocol_version >= 28) |
418 | flags |= SAME_DEV; | |
419 | } | |
420 | else | |
30f337c9 | 421 | dev = file->dev; |
c4b4df4f WD |
422 | flags |= HAS_INODE_DATA; |
423 | } | |
ebed4c3a MP |
424 | |
425 | for (l1 = 0; | |
426 | lastname[l1] && (fname[l1] == lastname[l1]) && (l1 < 255); | |
dbda5fbf | 427 | l1++) {} |
72914a60 AT |
428 | l2 = strlen(fname) - l1; |
429 | ||
ebed4c3a MP |
430 | if (l1 > 0) |
431 | flags |= SAME_NAME; | |
432 | if (l2 > 255) | |
433 | flags |= LONG_NAME; | |
72914a60 | 434 | |
75bc8600 WD |
435 | /* We must make sure we don't send a zero flags byte or |
436 | * the other end will terminate the flist transfer. */ | |
30f337c9 | 437 | if (flags == 0 && !S_ISDIR(mode)) |
75bc8600 WD |
438 | flags |= FLAG_DELETE; /* NOTE: no meaning for non-dir */ |
439 | if (protocol_version >= 28) { | |
440 | if ((flags & 0xFF00) || flags == 0) { | |
441 | flags |= EXTENDED_FLAGS; | |
442 | write_byte(f, flags); | |
443 | write_byte(f, flags >> 8); | |
444 | } else | |
445 | write_byte(f, flags); | |
446 | } else { | |
447 | if (flags == 0) | |
448 | flags |= LONG_NAME; | |
449 | write_byte(f, flags); | |
450 | } | |
72914a60 | 451 | if (flags & SAME_NAME) |
ebed4c3a | 452 | write_byte(f, l1); |
72914a60 | 453 | if (flags & LONG_NAME) |
ebed4c3a | 454 | write_int(f, l2); |
72914a60 | 455 | else |
ebed4c3a MP |
456 | write_byte(f, l2); |
457 | write_buf(f, fname + l1, l2); | |
72914a60 | 458 | |
ebed4c3a | 459 | write_longint(f, file->length); |
72914a60 | 460 | if (!(flags & SAME_TIME)) |
30f337c9 | 461 | write_int(f, modtime); |
72914a60 | 462 | if (!(flags & SAME_MODE)) |
30f337c9 | 463 | write_int(f, to_wire_mode(mode)); |
72914a60 | 464 | if (preserve_uid && !(flags & SAME_UID)) { |
30f337c9 WD |
465 | add_uid(uid); |
466 | write_int(f, uid); | |
72914a60 AT |
467 | } |
468 | if (preserve_gid && !(flags & SAME_GID)) { | |
30f337c9 WD |
469 | add_gid(gid); |
470 | write_int(f, gid); | |
72914a60 | 471 | } |
30f337c9 | 472 | if (preserve_devices && IS_DEVICE(mode)) { |
0c429465 WD |
473 | /* If SAME_HIGH_RDEV is off, SAME_RDEV_pre28 is also off. |
474 | * Also, avoid using "rdev" because it may be incomplete. */ | |
75bc8600 | 475 | if (!(flags & SAME_HIGH_RDEV)) |
30f337c9 | 476 | write_int(f, file->rdev); |
75bc8600 | 477 | else if (protocol_version >= 28) |
30f337c9 | 478 | write_byte(f, file->rdev); |
75bc8600 | 479 | } |
c627d613 AT |
480 | |
481 | #if SUPPORT_LINKS | |
30f337c9 | 482 | if (preserve_links && S_ISLNK(mode)) { |
ebed4c3a MP |
483 | write_int(f, strlen(file->link)); |
484 | write_buf(f, file->link, strlen(file->link)); | |
72914a60 | 485 | } |
c627d613 AT |
486 | #endif |
487 | ||
dc5ddbcc | 488 | #if SUPPORT_HARD_LINKS |
c4b4df4f | 489 | if (flags & HAS_INODE_DATA) { |
d04e9c51 | 490 | if (protocol_version < 26) { |
736a6a29 | 491 | /* 32-bit dev_t and ino_t */ |
30f337c9 | 492 | write_int(f, dev); |
c4b4df4f | 493 | write_int(f, file->inode); |
736a6a29 MP |
494 | } else { |
495 | /* 64-bit dev_t and ino_t */ | |
c4b4df4f | 496 | if (!(flags & SAME_DEV)) |
30f337c9 | 497 | write_longint(f, dev); |
6abd193f | 498 | write_longint(f, file->inode); |
736a6a29 | 499 | } |
72914a60 | 500 | } |
dc5ddbcc AT |
501 | #endif |
502 | ||
72914a60 | 503 | if (always_checksum) { |
b7736c79 | 504 | if (protocol_version < 21) |
ebed4c3a | 505 | write_buf(f, file->sum, 2); |
b7736c79 | 506 | else |
ebed4c3a | 507 | write_buf(f, file->sum, MD4_SUM_LENGTH); |
ebed4c3a | 508 | } |
182dca5c | 509 | |
ebed4c3a MP |
510 | strlcpy(lastname, fname, MAXPATHLEN); |
511 | lastname[MAXPATHLEN - 1] = 0; | |
eca2adb4 MP |
512 | |
513 | io_write_phase = "unknown"; | |
182dca5c AT |
514 | } |
515 | ||
516 | ||
517 | ||
3333ffbd | 518 | static void receive_file_entry(struct file_struct **fptr, |
1ef00d20 | 519 | unsigned short flags, int f) |
182dca5c | 520 | { |
30f337c9 WD |
521 | static time_t modtime; |
522 | static mode_t mode; | |
dd7fb70f | 523 | static DEV64_T rdev; /* just high bytes after p28 */ |
30f337c9 WD |
524 | static uid_t uid; |
525 | static gid_t gid; | |
526 | static DEV64_T dev; | |
72914a60 AT |
527 | static char lastname[MAXPATHLEN]; |
528 | char thisname[MAXPATHLEN]; | |
ebed4c3a | 529 | unsigned int l1 = 0, l2 = 0; |
72914a60 AT |
530 | char *p; |
531 | struct file_struct *file; | |
532 | ||
533 | if (flags & SAME_NAME) | |
534 | l1 = read_byte(f); | |
ebed4c3a | 535 | |
72914a60 AT |
536 | if (flags & LONG_NAME) |
537 | l2 = read_int(f); | |
538 | else | |
539 | l2 = read_byte(f); | |
540 | ||
58cadc86 | 541 | file = new(struct file_struct); |
ebed4c3a MP |
542 | if (!file) |
543 | out_of_memory("receive_file_entry"); | |
544 | memset((char *) file, 0, sizeof(*file)); | |
72914a60 AT |
545 | (*fptr) = file; |
546 | ||
ebed4c3a MP |
547 | if (l2 >= MAXPATHLEN - l1) { |
548 | rprintf(FERROR, | |
549 | "overflow: flags=0x%x l1=%d l2=%d lastname=%s\n", | |
d0fd26aa AT |
550 | flags, l1, l2, lastname); |
551 | overflow("receive_file_entry"); | |
552 | } | |
72914a60 | 553 | |
ebed4c3a MP |
554 | strlcpy(thisname, lastname, l1 + 1); |
555 | read_sbuf(f, &thisname[l1], l2); | |
556 | thisname[l1 + l2] = 0; | |
72914a60 | 557 | |
ebed4c3a MP |
558 | strlcpy(lastname, thisname, MAXPATHLEN); |
559 | lastname[MAXPATHLEN - 1] = 0; | |
72914a60 AT |
560 | |
561 | clean_fname(thisname); | |
562 | ||
cb13abfe DD |
563 | if (sanitize_paths) { |
564 | sanitize_path(thisname, NULL); | |
565 | } | |
566 | ||
ebed4c3a | 567 | if ((p = strrchr(thisname, '/'))) { |
72914a60 AT |
568 | static char *lastdir; |
569 | *p = 0; | |
b7736c79 | 570 | if (lastdir && strcmp(thisname, lastdir) == 0) |
72914a60 | 571 | file->dirname = lastdir; |
b7736c79 | 572 | else { |
72914a60 AT |
573 | file->dirname = strdup(thisname); |
574 | lastdir = file->dirname; | |
575 | } | |
ebed4c3a | 576 | file->basename = strdup(p + 1); |
72914a60 AT |
577 | } else { |
578 | file->dirname = NULL; | |
579 | file->basename = strdup(thisname); | |
580 | } | |
581 | ||
ebed4c3a MP |
582 | if (!file->basename) |
583 | out_of_memory("receive_file_entry 1"); | |
72914a60 | 584 | |
72914a60 AT |
585 | file->flags = flags; |
586 | file->length = read_longint(f); | |
1ef00d20 | 587 | if (!(flags & SAME_TIME)) |
30f337c9 WD |
588 | modtime = (time_t)read_int(f); |
589 | file->modtime = modtime; | |
1ef00d20 | 590 | if (!(flags & SAME_MODE)) |
30f337c9 WD |
591 | mode = from_wire_mode(read_int(f)); |
592 | file->mode = mode; | |
1ef00d20 WD |
593 | |
594 | if (preserve_uid) { | |
595 | if (!(flags & SAME_UID)) | |
30f337c9 WD |
596 | uid = (uid_t)read_int(f); |
597 | file->uid = uid; | |
1ef00d20 WD |
598 | } |
599 | if (preserve_gid) { | |
600 | if (!(flags & SAME_GID)) | |
30f337c9 WD |
601 | gid = (gid_t)read_int(f); |
602 | file->gid = gid; | |
1ef00d20 WD |
603 | } |
604 | if (preserve_devices) { | |
75bc8600 | 605 | if (protocol_version < 28) { |
30f337c9 WD |
606 | if (IS_DEVICE(mode)) { |
607 | if (!(flags & SAME_RDEV_pre28)) | |
608 | rdev = (DEV64_T)read_int(f); | |
609 | file->rdev = rdev; | |
75bc8600 | 610 | } else |
30f337c9 WD |
611 | rdev = 0; |
612 | } else if (IS_DEVICE(mode)) { | |
613 | if (!(flags & SAME_HIGH_RDEV)) { | |
614 | file->rdev = (DEV64_T)read_int(f); | |
615 | rdev = file->rdev & ~0xFF; | |
616 | } else | |
dd7fb70f | 617 | file->rdev = rdev | (DEV64_T)read_byte(f); |
1ef00d20 | 618 | } |
b7736c79 | 619 | } |
72914a60 | 620 | |
30f337c9 | 621 | if (preserve_links && S_ISLNK(mode)) { |
72914a60 | 622 | int l = read_int(f); |
9dd891bb | 623 | if (l < 0) { |
ebed4c3a | 624 | rprintf(FERROR, "overflow: l=%d\n", l); |
9dd891bb MP |
625 | overflow("receive_file_entry"); |
626 | } | |
58cadc86 | 627 | file->link = new_array(char, l + 1); |
ebed4c3a MP |
628 | if (!file->link) |
629 | out_of_memory("receive_file_entry 2"); | |
630 | read_sbuf(f, file->link, l); | |
b7736c79 | 631 | if (sanitize_paths) |
cb13abfe | 632 | sanitize_path(file->link, file->dirname); |
72914a60 | 633 | } |
dc5ddbcc | 634 | #if SUPPORT_HARD_LINKS |
c4b4df4f | 635 | if (preserve_hard_links && protocol_version < 28 |
30f337c9 | 636 | && S_ISREG(mode)) |
c4b4df4f WD |
637 | file->flags |= HAS_INODE_DATA; |
638 | if (file->flags & HAS_INODE_DATA) { | |
d04e9c51 | 639 | if (protocol_version < 26) { |
30f337c9 | 640 | dev = read_int(f); |
736a6a29 MP |
641 | file->inode = read_int(f); |
642 | } else { | |
c4b4df4f | 643 | if (!(flags & SAME_DEV)) |
30f337c9 | 644 | dev = read_longint(f); |
736a6a29 MP |
645 | file->inode = read_longint(f); |
646 | } | |
30f337c9 | 647 | file->dev = dev; |
72914a60 | 648 | } |
dc5ddbcc | 649 | #endif |
ebed4c3a | 650 | |
72914a60 | 651 | if (always_checksum) { |
58cadc86 | 652 | file->sum = new_array(char, MD4_SUM_LENGTH); |
ebed4c3a MP |
653 | if (!file->sum) |
654 | out_of_memory("md4 sum"); | |
b7736c79 | 655 | if (protocol_version < 21) |
ebed4c3a | 656 | read_buf(f, file->sum, 2); |
b7736c79 | 657 | else |
ebed4c3a | 658 | read_buf(f, file->sum, MD4_SUM_LENGTH); |
72914a60 | 659 | } |
ebed4c3a | 660 | |
72914a60 AT |
661 | if (!preserve_perms) { |
662 | extern int orig_umask; | |
663 | /* set an appropriate set of permissions based on original | |
664 | permissions and umask. This emulates what GNU cp does */ | |
665 | file->mode &= ~orig_umask; | |
666 | } | |
c627d613 AT |
667 | } |
668 | ||
669 | ||
0c5f37d9 AT |
670 | /* determine if a file in a different filesstem should be skipped |
671 | when one_file_system is set. We bascally only want to include | |
672 | the mount points - but they can be hard to find! */ | |
ebed4c3a | 673 | static int skip_filesystem(char *fname, STRUCT_STAT * st) |
0c5f37d9 | 674 | { |
bcacc18b | 675 | STRUCT_STAT st2; |
0c5f37d9 AT |
676 | char *p = strrchr(fname, '/'); |
677 | ||
678 | /* skip all but directories */ | |
ebed4c3a MP |
679 | if (!S_ISDIR(st->st_mode)) |
680 | return 1; | |
0c5f37d9 AT |
681 | |
682 | /* if its not a subdirectory then allow */ | |
ebed4c3a MP |
683 | if (!p) |
684 | return 0; | |
0c5f37d9 AT |
685 | |
686 | *p = 0; | |
687 | if (link_stat(fname, &st2)) { | |
688 | *p = '/'; | |
689 | return 0; | |
690 | } | |
691 | *p = '/'; | |
ebed4c3a | 692 | |
0c5f37d9 AT |
693 | return (st2.st_dev != filesystem_dev); |
694 | } | |
4fe159a8 | 695 | |
3d382777 | 696 | #define STRDUP(ap, p) (ap ? string_area_strdup(ap, p) : strdup(p)) |
87a819ed MP |
697 | /* IRIX cc cares that the operands to the ternary have the same type. */ |
698 | #define MALLOC(ap, i) (ap ? (void*) string_area_malloc(ap, i) : malloc(i)) | |
3d382777 | 699 | |
db719fb0 MP |
700 | /** |
701 | * Create a file_struct for a named file by reading its stat() | |
702 | * information and performing extensive checks against global | |
703 | * options. | |
704 | * | |
705 | * @return the new file, or NULL if there was an error or this file | |
706 | * should be excluded. | |
707 | * | |
708 | * @todo There is a small optimization opportunity here to avoid | |
709 | * stat()ing the file in some circumstances, which has a certain cost. | |
710 | * We are called immediately after doing readdir(), and so we may | |
711 | * already know the d_type of the file. We could for example avoid | |
712 | * statting directories if we're not recursing, but this is not a very | |
713 | * important case. Some systems may not have d_type. | |
714 | **/ | |
429f9828 WD |
715 | struct file_struct *make_file(char *fname, struct string_area **ap, |
716 | int exclude_level) | |
c627d613 | 717 | { |
3ec4dd97 | 718 | struct file_struct *file; |
bcacc18b | 719 | STRUCT_STAT st; |
3ec4dd97 AT |
720 | char sum[SUM_LENGTH]; |
721 | char *p; | |
722 | char cleaned_name[MAXPATHLEN]; | |
b5313607 | 723 | char linkbuf[MAXPATHLEN]; |
ac1a0994 | 724 | extern int module_id; |
3ec4dd97 | 725 | |
37f9805d | 726 | strlcpy(cleaned_name, fname, MAXPATHLEN); |
ebed4c3a | 727 | cleaned_name[MAXPATHLEN - 1] = 0; |
3ec4dd97 | 728 | clean_fname(cleaned_name); |
b7736c79 | 729 | if (sanitize_paths) |
cb13abfe | 730 | sanitize_path(cleaned_name, NULL); |
3ec4dd97 AT |
731 | fname = cleaned_name; |
732 | ||
ebed4c3a | 733 | memset(sum, 0, SUM_LENGTH); |
3ec4dd97 | 734 | |
ebed4c3a | 735 | if (readlink_stat(fname, &st, linkbuf) != 0) { |
76e26e10 | 736 | int save_errno = errno; |
429f9828 | 737 | if (errno == ENOENT && exclude_level != NO_EXCLUDES) { |
dbda5fbf | 738 | /* either symlink pointing nowhere or file that |
1b85e3f1 DD |
739 | * was removed during rsync run; see if excluded |
740 | * before reporting an error */ | |
429f9828 | 741 | if (check_exclude_file(fname, 0, exclude_level)) { |
76e26e10 DD |
742 | /* file is excluded anyway, ignore silently */ |
743 | return NULL; | |
744 | } | |
745 | } | |
06c28400 | 746 | io_error |= IOERR_GENERAL; |
ea42541f WD |
747 | rprintf(FERROR, "readlink %s failed: %s\n", |
748 | full_fname(fname), strerror(save_errno)); | |
3ec4dd97 AT |
749 | return NULL; |
750 | } | |
c627d613 | 751 | |
429f9828 WD |
752 | /* backup.c calls us with exclude_level set to NO_EXCLUDES. */ |
753 | if (exclude_level == NO_EXCLUDES) | |
ebed4c3a | 754 | goto skip_excludes; |
ac1a0994 | 755 | |
24d0fcde | 756 | if (S_ISDIR(st.st_mode) && !recurse && !files_from) { |
ebed4c3a | 757 | rprintf(FINFO, "skipping directory %s\n", fname); |
3ec4dd97 AT |
758 | return NULL; |
759 | } | |
ebed4c3a | 760 | |
0c5f37d9 AT |
761 | if (one_file_system && st.st_dev != filesystem_dev) { |
762 | if (skip_filesystem(fname, &st)) | |
763 | return NULL; | |
764 | } | |
ebed4c3a | 765 | |
429f9828 | 766 | if (check_exclude_file(fname, S_ISDIR(st.st_mode) != 0, exclude_level)) |
76e26e10 DD |
767 | return NULL; |
768 | ||
ebed4c3a | 769 | if (lp_ignore_nonreadable(module_id) && access(fname, R_OK) != 0) |
ac1a0994 AT |
770 | return NULL; |
771 | ||
ebed4c3a | 772 | skip_excludes: |
ac1a0994 | 773 | |
3ec4dd97 | 774 | if (verbose > 2) |
429f9828 | 775 | rprintf(FINFO, "make_file(%s,*,%d)\n", fname, exclude_level); |
ebed4c3a | 776 | |
58cadc86 | 777 | file = new(struct file_struct); |
ebed4c3a MP |
778 | if (!file) |
779 | out_of_memory("make_file"); | |
780 | memset((char *) file, 0, sizeof(*file)); | |
3ec4dd97 | 781 | |
ebed4c3a | 782 | if ((p = strrchr(fname, '/'))) { |
3ec4dd97 AT |
783 | static char *lastdir; |
784 | *p = 0; | |
b7736c79 | 785 | if (lastdir && strcmp(fname, lastdir) == 0) |
3ec4dd97 | 786 | file->dirname = lastdir; |
b7736c79 | 787 | else { |
a20aa42a | 788 | file->dirname = strdup(fname); |
3ec4dd97 AT |
789 | lastdir = file->dirname; |
790 | } | |
ebed4c3a | 791 | file->basename = STRDUP(ap, p + 1); |
3ec4dd97 AT |
792 | *p = '/'; |
793 | } else { | |
794 | file->dirname = NULL; | |
3d382777 | 795 | file->basename = STRDUP(ap, fname); |
3ec4dd97 | 796 | } |
c627d613 | 797 | |
3ec4dd97 AT |
798 | file->modtime = st.st_mtime; |
799 | file->length = st.st_size; | |
800 | file->mode = st.st_mode; | |
801 | file->uid = st.st_uid; | |
802 | file->gid = st.st_gid; | |
c4b4df4f WD |
803 | if (preserve_hard_links) { |
804 | if (protocol_version < 28? S_ISREG(st.st_mode) | |
805 | : !S_ISDIR(st.st_mode) && st.st_nlink > 1) { | |
806 | file->dev = st.st_dev; | |
807 | file->inode = st.st_ino; | |
808 | file->flags |= HAS_INODE_DATA; | |
809 | } | |
810 | } | |
5f78da20 | 811 | #ifdef HAVE_STRUCT_STAT_ST_RDEV |
3ec4dd97 | 812 | file->rdev = st.st_rdev; |
c627d613 AT |
813 | #endif |
814 | ||
815 | #if SUPPORT_LINKS | |
b7736c79 | 816 | if (S_ISLNK(st.st_mode)) |
3d382777 | 817 | file->link = STRDUP(ap, linkbuf); |
c627d613 AT |
818 | #endif |
819 | ||
1250f24e | 820 | if (always_checksum) { |
ebed4c3a MP |
821 | file->sum = (char *) MALLOC(ap, MD4_SUM_LENGTH); |
822 | if (!file->sum) | |
823 | out_of_memory("md4 sum"); | |
1250f24e AT |
824 | /* drat. we have to provide a null checksum for non-regular |
825 | files in order to be compatible with earlier versions | |
826 | of rsync */ | |
827 | if (S_ISREG(st.st_mode)) { | |
ebed4c3a | 828 | file_checksum(fname, file->sum, st.st_size); |
1250f24e AT |
829 | } else { |
830 | memset(file->sum, 0, MD4_SUM_LENGTH); | |
831 | } | |
ebed4c3a | 832 | } |
c627d613 | 833 | |
3ec4dd97 AT |
834 | if (flist_dir) { |
835 | static char *lastdir; | |
b7736c79 | 836 | if (lastdir && strcmp(lastdir, flist_dir) == 0) |
3ec4dd97 | 837 | file->basedir = lastdir; |
b7736c79 | 838 | else { |
a20aa42a | 839 | file->basedir = strdup(flist_dir); |
3ec4dd97 AT |
840 | lastdir = file->basedir; |
841 | } | |
b7736c79 | 842 | } else |
3ec4dd97 | 843 | file->basedir = NULL; |
c627d613 | 844 | |
3ec4dd97 | 845 | if (!S_ISDIR(st.st_mode)) |
a800434a | 846 | stats.total_size += st.st_size; |
c627d613 | 847 | |
3ec4dd97 | 848 | return file; |
c627d613 AT |
849 | } |
850 | ||
851 | ||
ebed4c3a | 852 | void send_file_name(int f, struct file_list *flist, char *fname, |
1ef00d20 | 853 | int recursive, unsigned short base_flags) |
c627d613 | 854 | { |
ebed4c3a | 855 | struct file_struct *file; |
b7736c79 | 856 | char fbuf[MAXPATHLEN]; |
429f9828 | 857 | extern int delete_excluded; |
ebed4c3a | 858 | |
429f9828 WD |
859 | /* f is set to -1 when calculating deletion file list */ |
860 | file = make_file(fname, &flist->string_area, | |
861 | f == -1 && delete_excluded? SERVER_EXCLUDES | |
862 | : ALL_EXCLUDES); | |
ebed4c3a MP |
863 | |
864 | if (!file) | |
865 | return; | |
866 | ||
db719fb0 | 867 | maybe_emit_filelist_progress(flist); |
ebed4c3a | 868 | |
d9d6bc52 | 869 | flist_expand(flist); |
ebed4c3a | 870 | |
64c3523a | 871 | if (write_batch) |
1ef00d20 | 872 | file->flags |= FLAG_DELETE; |
ebed4c3a | 873 | |
c120ff37 | 874 | if (file->basename[0]) { |
ebed4c3a MP |
875 | flist->files[flist->count++] = file; |
876 | send_file_entry(file, f, base_flags); | |
877 | } | |
878 | ||
879 | if (S_ISDIR(file->mode) && recursive) { | |
880 | struct exclude_struct **last_exclude_list = | |
881 | local_exclude_list; | |
b7736c79 | 882 | send_directory(f, flist, f_name_to(file, fbuf, sizeof fbuf)); |
ebed4c3a MP |
883 | local_exclude_list = last_exclude_list; |
884 | return; | |
885 | } | |
c627d613 AT |
886 | } |
887 | ||
888 | ||
ebed4c3a | 889 | static void send_directory(int f, struct file_list *flist, char *dir) |
c627d613 | 890 | { |
3ec4dd97 AT |
891 | DIR *d; |
892 | struct dirent *di; | |
893 | char fname[MAXPATHLEN]; | |
894 | int l; | |
895 | char *p; | |
896 | ||
897 | d = opendir(dir); | |
898 | if (!d) { | |
06c28400 | 899 | io_error |= IOERR_GENERAL; |
ea42541f WD |
900 | rprintf(FERROR, "opendir %s failed: %s\n", |
901 | full_fname(dir), strerror(errno)); | |
3ec4dd97 AT |
902 | return; |
903 | } | |
c627d613 | 904 | |
ebed4c3a | 905 | strlcpy(fname, dir, MAXPATHLEN); |
3ec4dd97 | 906 | l = strlen(fname); |
ebed4c3a MP |
907 | if (fname[l - 1] != '/') { |
908 | if (l == MAXPATHLEN - 1) { | |
06c28400 | 909 | io_error |= IOERR_GENERAL; |
ea42541f WD |
910 | rprintf(FERROR, "skipping long-named directory: %s\n", |
911 | full_fname(fname)); | |
3ec4dd97 AT |
912 | closedir(d); |
913 | return; | |
914 | } | |
ebed4c3a | 915 | strlcat(fname, "/", MAXPATHLEN); |
3ec4dd97 AT |
916 | l++; |
917 | } | |
918 | p = fname + strlen(fname); | |
c627d613 | 919 | |
3d913675 AT |
920 | local_exclude_list = NULL; |
921 | ||
3ec4dd97 | 922 | if (cvs_exclude) { |
ebed4c3a MP |
923 | if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN - 1) { |
924 | strcpy(p, ".cvsignore"); | |
429f9828 | 925 | add_exclude_file(&exclude_list,fname,MISSING_OK,ADD_EXCLUDE); |
3ec4dd97 | 926 | } else { |
06c28400 | 927 | io_error |= IOERR_GENERAL; |
ebed4c3a MP |
928 | rprintf(FINFO, |
929 | "cannot cvs-exclude in long-named directory %s\n", | |
ea42541f | 930 | full_fname(fname)); |
3ec4dd97 | 931 | } |
ebed4c3a MP |
932 | } |
933 | ||
6a7cc46c | 934 | for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) { |
d6e6ecbd | 935 | char *dname = d_name(di); |
6a7cc46c S |
936 | if (dname[0] == '.' && (dname[1] == '\0' |
937 | || (dname[1] == '.' && dname[2] == '\0'))) | |
3ec4dd97 | 938 | continue; |
ebed4c3a MP |
939 | strlcpy(p, dname, MAXPATHLEN - l); |
940 | send_file_name(f, flist, fname, recurse, 0); | |
3ec4dd97 | 941 | } |
6a7cc46c | 942 | if (errno) { |
06c28400 | 943 | io_error |= IOERR_GENERAL; |
6a7cc46c S |
944 | rprintf(FERROR, "readdir(%s): (%d) %s\n", |
945 | dir, errno, strerror(errno)); | |
946 | } | |
c627d613 | 947 | |
429f9828 WD |
948 | if (local_exclude_list) |
949 | free_exclude_list(&local_exclude_list); /* Zeros pointer too */ | |
3d913675 | 950 | |
3ec4dd97 | 951 | closedir(d); |
c627d613 AT |
952 | } |
953 | ||
954 | ||
c4fea82f | 955 | /** |
429f9828 WD |
956 | * The delete_files() function in receiver.c sets f to -1 so that we just |
957 | * construct the file list in memory without sending it over the wire. It | |
958 | * also has the side-effect of ignoring user-excludes if delete_excluded | |
959 | * is set (so that the delete list includes user-excluded files). | |
c4fea82f | 960 | **/ |
ebed4c3a | 961 | struct file_list *send_file_list(int f, int argc, char *argv[]) |
c627d613 | 962 | { |
24d0fcde | 963 | int l; |
bcacc18b | 964 | STRUCT_STAT st; |
ebed4c3a MP |
965 | char *p, *dir, *olddir; |
966 | char lastpath[MAXPATHLEN] = ""; | |
649d65ed | 967 | struct file_list *flist; |
a800434a | 968 | int64 start_write; |
24d0fcde | 969 | int use_ff_fd = 0; |
649d65ed | 970 | |
1bbd10fe DD |
971 | if (show_filelist_p() && f != -1) |
972 | start_filelist_progress("building file list"); | |
c627d613 | 973 | |
a800434a AT |
974 | start_write = stats.total_written; |
975 | ||
3d382777 | 976 | flist = flist_new(); |
c627d613 | 977 | |
d6dead6b | 978 | if (f != -1) { |
76c21947 | 979 | io_start_buffering_out(f); |
24d0fcde WD |
980 | if (filesfrom_fd >= 0) { |
981 | if (argv[0] && !push_dir(argv[0], 0)) { | |
ea42541f WD |
982 | rprintf(FERROR, "push_dir %s failed: %s\n", |
983 | full_fname(argv[0]), strerror(errno)); | |
24d0fcde WD |
984 | exit_cleanup(RERR_FILESELECT); |
985 | } | |
986 | use_ff_fd = 1; | |
987 | } | |
d6dead6b AT |
988 | } |
989 | ||
24d0fcde | 990 | while (1) { |
fc638474 DD |
991 | char fname2[MAXPATHLEN]; |
992 | char *fname = fname2; | |
c627d613 | 993 | |
24d0fcde WD |
994 | if (use_ff_fd) { |
995 | if (read_filesfrom_line(filesfrom_fd, fname) == 0) | |
996 | break; | |
997 | sanitize_path(fname, NULL); | |
998 | } else { | |
999 | if (argc-- == 0) | |
1000 | break; | |
1001 | strlcpy(fname, *argv++, MAXPATHLEN); | |
1002 | if (sanitize_paths) | |
1003 | sanitize_path(fname, NULL); | |
1004 | } | |
c627d613 | 1005 | |
649d65ed | 1006 | l = strlen(fname); |
6931c138 WD |
1007 | if (fname[l - 1] == '/') { |
1008 | if (l == 2 && fname[0] == '.') { | |
1009 | /* Turn "./" into just "." rather than "./." */ | |
1010 | fname[1] = '\0'; | |
53f821f1 | 1011 | } else { |
ebed4c3a | 1012 | strlcat(fname, ".", MAXPATHLEN); |
53f821f1 | 1013 | } |
649d65ed | 1014 | } |
c627d613 | 1015 | |
ebed4c3a | 1016 | if (link_stat(fname, &st) != 0) { |
f76933b1 | 1017 | if (f != -1) { |
06c28400 | 1018 | io_error |= IOERR_GENERAL; |
ea42541f WD |
1019 | rprintf(FERROR, "link_stat %s failed: %s\n", |
1020 | full_fname(fname), strerror(errno)); | |
f76933b1 | 1021 | } |
649d65ed AT |
1022 | continue; |
1023 | } | |
c627d613 | 1024 | |
24d0fcde | 1025 | if (S_ISDIR(st.st_mode) && !recurse && !files_from) { |
ebed4c3a | 1026 | rprintf(FINFO, "skipping directory %s\n", fname); |
649d65ed AT |
1027 | continue; |
1028 | } | |
c627d613 | 1029 | |
649d65ed | 1030 | dir = NULL; |
2bca43f6 | 1031 | olddir = NULL; |
649d65ed AT |
1032 | |
1033 | if (!relative_paths) { | |
ebed4c3a | 1034 | p = strrchr(fname, '/'); |
649d65ed AT |
1035 | if (p) { |
1036 | *p = 0; | |
ebed4c3a | 1037 | if (p == fname) |
649d65ed AT |
1038 | dir = "/"; |
1039 | else | |
ebed4c3a MP |
1040 | dir = fname; |
1041 | fname = p + 1; | |
649d65ed | 1042 | } |
24d0fcde | 1043 | } else if (f != -1 && implied_dirs && (p=strrchr(fname,'/')) && p != fname) { |
649d65ed AT |
1044 | /* this ensures we send the intermediate directories, |
1045 | thus getting their permissions right */ | |
2154309a | 1046 | char *lp = lastpath, *fn = fname, *slash = fname; |
649d65ed | 1047 | *p = 0; |
2154309a WD |
1048 | /* Skip any initial directories in our path that we |
1049 | * have in common with lastpath. */ | |
1050 | while (*fn && *lp == *fn) { | |
1051 | if (*fn == '/') | |
1052 | slash = fn; | |
1053 | lp++, fn++; | |
1054 | } | |
1055 | *p = '/'; | |
1056 | if (fn != p || (*lp && *lp != '/')) { | |
1057 | int copy_links_saved = copy_links; | |
1058 | int recurse_saved = recurse; | |
1059 | copy_links = copy_unsafe_links; | |
1060 | /* set recurse to 1 to prevent make_file | |
1061 | * from ignoring directory, but still | |
1062 | * turn off the recursive parameter to | |
1063 | * send_file_name */ | |
1064 | recurse = 1; | |
1065 | while ((slash = strchr(slash+1, '/')) != 0) { | |
1066 | *slash = 0; | |
1067 | send_file_name(f, flist, fname, 0, 0); | |
1068 | *slash = '/'; | |
649d65ed | 1069 | } |
2154309a WD |
1070 | copy_links = copy_links_saved; |
1071 | recurse = recurse_saved; | |
1072 | *p = 0; | |
1073 | strlcpy(lastpath, fname, sizeof lastpath); | |
649d65ed AT |
1074 | *p = '/'; |
1075 | } | |
1076 | } | |
ebed4c3a | 1077 | |
649d65ed AT |
1078 | if (!*fname) |
1079 | fname = "."; | |
ebed4c3a | 1080 | |
649d65ed | 1081 | if (dir && *dir) { |
2bca43f6 | 1082 | olddir = push_dir(dir, 1); |
5243c216 AT |
1083 | |
1084 | if (!olddir) { | |
06c28400 | 1085 | io_error |= IOERR_GENERAL; |
ea42541f WD |
1086 | rprintf(FERROR, "push_dir %s failed: %s\n", |
1087 | full_fname(dir), strerror(errno)); | |
649d65ed AT |
1088 | continue; |
1089 | } | |
5243c216 | 1090 | |
649d65ed | 1091 | flist_dir = dir; |
2bca43f6 | 1092 | } |
ebed4c3a | 1093 | |
2bca43f6 DD |
1094 | if (one_file_system) |
1095 | set_filesystem(fname); | |
1096 | ||
ebed4c3a | 1097 | send_file_name(f, flist, fname, recurse, FLAG_DELETE); |
2bca43f6 DD |
1098 | |
1099 | if (olddir != NULL) { | |
649d65ed | 1100 | flist_dir = NULL; |
5243c216 | 1101 | if (pop_dir(olddir) != 0) { |
ea42541f WD |
1102 | rprintf(FERROR, "pop_dir %s failed: %s\n", |
1103 | full_fname(dir), strerror(errno)); | |
65417579 | 1104 | exit_cleanup(RERR_FILESELECT); |
649d65ed | 1105 | } |
649d65ed | 1106 | } |
649d65ed | 1107 | } |
dc5ddbcc | 1108 | |
b7736c79 | 1109 | if (f != -1) |
ebed4c3a | 1110 | send_file_entry(NULL, f, 0); |
c627d613 | 1111 | |
b7736c79 | 1112 | if (show_filelist_p() && f != -1) |
1bbd10fe | 1113 | finish_filelist_progress(flist); |
ebed4c3a | 1114 | |
827c37f6 | 1115 | clean_flist(flist, 0, 0); |
ebed4c3a | 1116 | |
649d65ed | 1117 | /* now send the uid/gid list. This was introduced in protocol |
ebed4c3a | 1118 | version 15 */ |
b7736c79 | 1119 | if (f != -1) |
649d65ed | 1120 | send_uid_list(f); |
f6c34742 | 1121 | |
91c4da3f S |
1122 | /* send the io_error flag */ |
1123 | if (f != -1) { | |
cda2ae84 | 1124 | extern int module_id; |
ebed4c3a | 1125 | write_int(f, lp_ignore_errors(module_id) ? 0 : io_error); |
6ba9279f AT |
1126 | } |
1127 | ||
d6dead6b | 1128 | if (f != -1) { |
a261989c | 1129 | io_end_buffering(); |
a800434a AT |
1130 | stats.flist_size = stats.total_written - start_write; |
1131 | stats.num_files = flist->count; | |
64c3523a | 1132 | if (write_batch) |
ebed4c3a | 1133 | write_batch_flist_info(flist->count, flist->files); |
d6dead6b AT |
1134 | } |
1135 | ||
17faa41c | 1136 | if (verbose > 2) |
ebed4c3a | 1137 | rprintf(FINFO, "send_file_list done\n"); |
17faa41c | 1138 | |
649d65ed | 1139 | return flist; |
c627d613 AT |
1140 | } |
1141 | ||
1142 | ||
1143 | struct file_list *recv_file_list(int f) | |
1144 | { | |
ebed4c3a | 1145 | struct file_list *flist; |
1ef00d20 | 1146 | unsigned short flags; |
ebed4c3a MP |
1147 | int64 start_read; |
1148 | extern int list_only; | |
c627d613 | 1149 | |
1bbd10fe DD |
1150 | if (show_filelist_p()) |
1151 | start_filelist_progress("receiving file list"); | |
c627d613 | 1152 | |
ebed4c3a | 1153 | start_read = stats.total_read; |
a800434a | 1154 | |
58cadc86 | 1155 | flist = new(struct file_list); |
ebed4c3a MP |
1156 | if (!flist) |
1157 | goto oom; | |
c627d613 | 1158 | |
ebed4c3a MP |
1159 | flist->count = 0; |
1160 | flist->malloced = 1000; | |
58cadc86 | 1161 | flist->files = new_array(struct file_struct *, flist->malloced); |
ebed4c3a MP |
1162 | if (!flist->files) |
1163 | goto oom; | |
c627d613 AT |
1164 | |
1165 | ||
1ef00d20 | 1166 | while ((flags = read_byte(f)) != 0) { |
5d2c5c4c | 1167 | int i = flist->count; |
dbda5fbf | 1168 | |
d9d6bc52 | 1169 | flist_expand(flist); |
c627d613 | 1170 | |
75bc8600 WD |
1171 | if (protocol_version >= 28 && (flags & EXTENDED_FLAGS)) |
1172 | flags |= read_byte(f) << 8; | |
ebed4c3a | 1173 | receive_file_entry(&flist->files[i], flags, f); |
c627d613 | 1174 | |
ebed4c3a MP |
1175 | if (S_ISREG(flist->files[i]->mode)) |
1176 | stats.total_size += flist->files[i]->length; | |
c627d613 | 1177 | |
ebed4c3a | 1178 | flist->count++; |
c627d613 | 1179 | |
db719fb0 | 1180 | maybe_emit_filelist_progress(flist); |
1bbd10fe | 1181 | |
8018edd3 | 1182 | if (verbose > 2) { |
ebed4c3a MP |
1183 | rprintf(FINFO, "recv_file_name(%s)\n", |
1184 | f_name(flist->files[i])); | |
8018edd3 | 1185 | } |
ebed4c3a | 1186 | } |
c627d613 AT |
1187 | |
1188 | ||
ebed4c3a MP |
1189 | if (verbose > 2) |
1190 | rprintf(FINFO, "received %d names\n", flist->count); | |
c627d613 | 1191 | |
827c37f6 | 1192 | clean_flist(flist, relative_paths, 1); |
c627d613 | 1193 | |
b7736c79 | 1194 | if (show_filelist_p()) |
1bbd10fe | 1195 | finish_filelist_progress(flist); |
a06d19e3 | 1196 | |
ebed4c3a | 1197 | /* now recv the uid/gid list. This was introduced in protocol version 15 */ |
b7736c79 | 1198 | if (f != -1) |
ebed4c3a | 1199 | recv_uid_list(f, flist); |
f6c34742 | 1200 | |
91c4da3f S |
1201 | /* recv the io_error flag */ |
1202 | if (f != -1 && !read_batch) { /* dw-added readbatch */ | |
ebed4c3a MP |
1203 | extern int module_id; |
1204 | extern int ignore_errors; | |
b7736c79 | 1205 | if (lp_ignore_errors(module_id) || ignore_errors) |
ebed4c3a | 1206 | read_int(f); |
b7736c79 | 1207 | else |
ebed4c3a | 1208 | io_error |= read_int(f); |
ebed4c3a | 1209 | } |
6ba9279f | 1210 | |
ebed4c3a MP |
1211 | if (list_only) { |
1212 | int i; | |
b7736c79 | 1213 | for (i = 0; i < flist->count; i++) |
ebed4c3a | 1214 | list_file_entry(flist->files[i]); |
ebed4c3a | 1215 | } |
f7632fc6 AT |
1216 | |
1217 | ||
ebed4c3a MP |
1218 | if (verbose > 2) |
1219 | rprintf(FINFO, "recv_file_list done\n"); | |
17faa41c | 1220 | |
ebed4c3a MP |
1221 | stats.flist_size = stats.total_read - start_read; |
1222 | stats.num_files = flist->count; | |
a800434a | 1223 | |
ebed4c3a | 1224 | return flist; |
c627d613 | 1225 | |
ebed4c3a MP |
1226 | oom: |
1227 | out_of_memory("recv_file_list"); | |
1228 | return NULL; /* not reached */ | |
c627d613 AT |
1229 | } |
1230 | ||
1231 | ||
fa45cda1 | 1232 | int file_compare(struct file_struct **file1, struct file_struct **file2) |
c627d613 | 1233 | { |
fa45cda1 S |
1234 | struct file_struct *f1 = *file1; |
1235 | struct file_struct *f2 = *file2; | |
1236 | ||
1237 | if (!f1->basename && !f2->basename) | |
ebed4c3a | 1238 | return 0; |
fa45cda1 | 1239 | if (!f1->basename) |
ebed4c3a | 1240 | return -1; |
fa45cda1 | 1241 | if (!f2->basename) |
ebed4c3a | 1242 | return 1; |
fa45cda1 S |
1243 | if (f1->dirname == f2->dirname) |
1244 | return u_strcmp(f1->basename, f2->basename); | |
1245 | return f_name_cmp(f1, f2); | |
c627d613 AT |
1246 | } |
1247 | ||
1248 | ||
ebed4c3a | 1249 | int flist_find(struct file_list *flist, struct file_struct *f) |
c627d613 | 1250 | { |
ebed4c3a | 1251 | int low = 0, high = flist->count - 1; |
d966ee25 | 1252 | |
ca23c51a WD |
1253 | while (high >= 0 && !flist->files[high]->basename) high--; |
1254 | ||
1255 | if (high < 0) | |
ebed4c3a | 1256 | return -1; |
d966ee25 AT |
1257 | |
1258 | while (low != high) { | |
ebed4c3a | 1259 | int mid = (low + high) / 2; |
b7736c79 | 1260 | int ret = file_compare(&flist->files[flist_up(flist, mid)],&f); |
ebed4c3a MP |
1261 | if (ret == 0) |
1262 | return flist_up(flist, mid); | |
b7736c79 | 1263 | if (ret > 0) |
ebed4c3a | 1264 | high = mid; |
b7736c79 | 1265 | else |
ebed4c3a | 1266 | low = mid + 1; |
d966ee25 AT |
1267 | } |
1268 | ||
ebed4c3a MP |
1269 | if (file_compare(&flist->files[flist_up(flist, low)], &f) == 0) |
1270 | return flist_up(flist, low); | |
d966ee25 | 1271 | return -1; |
c627d613 AT |
1272 | } |
1273 | ||
1274 | ||
3ec4dd97 AT |
1275 | /* |
1276 | * free up one file | |
1277 | */ | |
66203a98 | 1278 | void free_file(struct file_struct *file) |
c627d613 | 1279 | { |
ebed4c3a MP |
1280 | if (!file) |
1281 | return; | |
1282 | if (file->basename) | |
1283 | free(file->basename); | |
1284 | if (file->link) | |
1285 | free(file->link); | |
1286 | if (file->sum) | |
1287 | free(file->sum); | |
3d382777 | 1288 | *file = null_file; |
3ec4dd97 | 1289 | } |
c627d613 | 1290 | |
c627d613 | 1291 | |
3d382777 AT |
1292 | /* |
1293 | * allocate a new file list | |
1294 | */ | |
1e34e4b7 | 1295 | struct file_list *flist_new(void) |
3d382777 AT |
1296 | { |
1297 | struct file_list *flist; | |
1298 | ||
58cadc86 | 1299 | flist = new(struct file_list); |
ebed4c3a MP |
1300 | if (!flist) |
1301 | out_of_memory("send_file_list"); | |
3d382777 | 1302 | |
ebed4c3a | 1303 | flist->count = 0; |
d9d6bc52 MP |
1304 | flist->malloced = 0; |
1305 | flist->files = NULL; | |
1306 | ||
3d382777 AT |
1307 | #if ARENA_SIZE > 0 |
1308 | flist->string_area = string_area_new(0); | |
1309 | #else | |
5c66303a | 1310 | flist->string_area = NULL; |
3d382777 AT |
1311 | #endif |
1312 | return flist; | |
1313 | } | |
ebed4c3a | 1314 | |
3ec4dd97 AT |
1315 | /* |
1316 | * free up all elements in a flist | |
1317 | */ | |
1318 | void flist_free(struct file_list *flist) | |
1319 | { | |
1320 | int i; | |
ebed4c3a | 1321 | for (i = 1; i < flist->count; i++) { |
3d382777 AT |
1322 | if (!flist->string_area) |
1323 | free_file(flist->files[i]); | |
649d65ed | 1324 | free(flist->files[i]); |
ebed4c3a | 1325 | } |
d9d6bc52 MP |
1326 | /* FIXME: I don't think we generally need to blank the flist |
1327 | * since it's about to be freed. This will just cause more | |
1328 | * memory traffic. If you want a freed-memory debugger, you | |
1329 | * know where to get it. */ | |
ebed4c3a MP |
1330 | memset((char *) flist->files, 0, |
1331 | sizeof(flist->files[0]) * flist->count); | |
3ec4dd97 | 1332 | free(flist->files); |
3d382777 AT |
1333 | if (flist->string_area) |
1334 | string_area_free(flist->string_area); | |
ebed4c3a | 1335 | memset((char *) flist, 0, sizeof(*flist)); |
3ec4dd97 | 1336 | free(flist); |
c627d613 AT |
1337 | } |
1338 | ||
1339 | ||
1340 | /* | |
1341 | * This routine ensures we don't have any duplicate names in our file list. | |
dbda5fbf | 1342 | * duplicate names can cause corruption because of the pipelining |
c627d613 | 1343 | */ |
827c37f6 | 1344 | static void clean_flist(struct file_list *flist, int strip_root, int no_dups) |
c627d613 | 1345 | { |
6931c138 | 1346 | int i, prev_i = 0; |
c627d613 | 1347 | |
ebed4c3a | 1348 | if (!flist || flist->count == 0) |
3ec4dd97 | 1349 | return; |
3ec4dd97 | 1350 | |
ebed4c3a MP |
1351 | qsort(flist->files, flist->count, |
1352 | sizeof(flist->files[0]), (int (*)()) file_compare); | |
1353 | ||
827c37f6 | 1354 | for (i = no_dups? 0 : flist->count; i < flist->count; i++) { |
b91b50c0 | 1355 | if (flist->files[i]->basename) { |
6931c138 | 1356 | prev_i = i; |
b91b50c0 WD |
1357 | break; |
1358 | } | |
1359 | } | |
1360 | while (++i < flist->count) { | |
1361 | if (!flist->files[i]->basename) | |
1362 | continue; | |
8018edd3 | 1363 | if (f_name_cmp(flist->files[i], flist->files[prev_i]) == 0) { |
b91b50c0 | 1364 | if (verbose > 1 && !am_server) { |
ebed4c3a MP |
1365 | rprintf(FINFO, |
1366 | "removing duplicate name %s from file list %d\n", | |
8018edd3 | 1367 | f_name(flist->files[i]), i); |
b91b50c0 | 1368 | } |
6931c138 WD |
1369 | /* Make sure that if we unduplicate '.', that we don't |
1370 | * lose track of a user-specified starting point (or | |
1371 | * else deletions will mysteriously fail with -R). */ | |
1372 | if (flist->files[i]->flags & FLAG_DELETE) | |
1373 | flist->files[prev_i]->flags |= FLAG_DELETE; | |
b91b50c0 WD |
1374 | /* it's not great that the flist knows the semantics of |
1375 | * the file memory usage, but i'd rather not add a flag | |
1376 | * byte to that struct. | |
1377 | * XXX can i use a bit in the flags field? */ | |
3d382777 AT |
1378 | if (flist->string_area) |
1379 | flist->files[i][0] = null_file; | |
1380 | else | |
1381 | free_file(flist->files[i]); | |
ebed4c3a | 1382 | } |
6931c138 WD |
1383 | else |
1384 | prev_i = i; | |
3ec4dd97 | 1385 | } |
0199b05f AT |
1386 | |
1387 | if (strip_root) { | |
1388 | /* we need to strip off the root directory in the case | |
1389 | of relative paths, but this must be done _after_ | |
1390 | the sorting phase */ | |
ebed4c3a | 1391 | for (i = 0; i < flist->count; i++) { |
0199b05f AT |
1392 | if (flist->files[i]->dirname && |
1393 | flist->files[i]->dirname[0] == '/') { | |
1394 | memmove(&flist->files[i]->dirname[0], | |
1395 | &flist->files[i]->dirname[1], | |
1396 | strlen(flist->files[i]->dirname)); | |
1397 | } | |
ebed4c3a MP |
1398 | |
1399 | if (flist->files[i]->dirname && | |
0199b05f AT |
1400 | !flist->files[i]->dirname[0]) { |
1401 | flist->files[i]->dirname = NULL; | |
1402 | } | |
1403 | } | |
1404 | } | |
1405 | ||
ebed4c3a MP |
1406 | if (verbose <= 3) |
1407 | return; | |
0199b05f | 1408 | |
ebed4c3a | 1409 | for (i = 0; i < flist->count; i++) { |
1ef00d20 WD |
1410 | rprintf(FINFO, "[%ld] i=%d %s %s mode=0%o len=%.0f\n", |
1411 | (long) getpid(), i, | |
74e708d8 AT |
1412 | NS(flist->files[i]->dirname), |
1413 | NS(flist->files[i]->basename), | |
08a740ff | 1414 | (int) flist->files[i]->mode, |
ebed4c3a | 1415 | (double) flist->files[i]->length); |
0199b05f | 1416 | } |
3ec4dd97 AT |
1417 | } |
1418 | ||
1419 | ||
8018edd3 WD |
1420 | enum fnc_state { fnc_DIR, fnc_SLASH, fnc_BASE }; |
1421 | ||
1422 | /* Compare the names of two file_struct entities, just like strcmp() | |
1423 | * would do if it were operating on the joined strings. We assume | |
1424 | * that there are no 0-length strings. | |
3ec4dd97 | 1425 | */ |
8018edd3 | 1426 | int f_name_cmp(struct file_struct *f1, struct file_struct *f2) |
3ec4dd97 | 1427 | { |
8018edd3 WD |
1428 | int dif; |
1429 | const uchar *c1, *c2; | |
1ef00d20 | 1430 | enum fnc_state state1, state2; |
8018edd3 WD |
1431 | |
1432 | if (!f1 || !f1->basename) { | |
1433 | if (!f2 || !f2->basename) | |
1434 | return 0; | |
1435 | return -1; | |
1436 | } | |
1437 | if (!f2 || !f2->basename) | |
1438 | return 1; | |
1439 | ||
e90b8ace | 1440 | if (!(c1 = (uchar*)f1->dirname)) { |
8018edd3 | 1441 | state1 = fnc_BASE; |
e90b8ace | 1442 | c1 = (uchar*)f1->basename; |
8018edd3 | 1443 | } |
1ef00d20 WD |
1444 | else |
1445 | state1 = fnc_DIR; | |
e90b8ace | 1446 | if (!(c2 = (uchar*)f2->dirname)) { |
8018edd3 | 1447 | state2 = fnc_BASE; |
e90b8ace | 1448 | c2 = (uchar*)f2->basename; |
8018edd3 | 1449 | } |
1ef00d20 WD |
1450 | else |
1451 | state2 = fnc_DIR; | |
8018edd3 WD |
1452 | |
1453 | while (1) { | |
1454 | if ((dif = (int)*c1 - (int)*c2) != 0) | |
1455 | break; | |
1456 | if (!*++c1) { | |
1457 | switch (state1) { | |
1458 | case fnc_DIR: | |
1459 | state1 = fnc_SLASH; | |
e90b8ace | 1460 | c1 = (uchar*)"/"; |
8018edd3 WD |
1461 | break; |
1462 | case fnc_SLASH: | |
1463 | state1 = fnc_BASE; | |
e90b8ace | 1464 | c1 = (uchar*)f1->basename; |
8018edd3 WD |
1465 | break; |
1466 | case fnc_BASE: | |
1467 | break; | |
1468 | } | |
1469 | } | |
1470 | if (!*++c2) { | |
1471 | switch (state2) { | |
1472 | case fnc_DIR: | |
1473 | state2 = fnc_SLASH; | |
e90b8ace | 1474 | c2 = (uchar*)"/"; |
8018edd3 WD |
1475 | break; |
1476 | case fnc_SLASH: | |
1477 | state2 = fnc_BASE; | |
e90b8ace | 1478 | c2 = (uchar*)f2->basename; |
8018edd3 WD |
1479 | break; |
1480 | case fnc_BASE: | |
1481 | if (!*c1) | |
1482 | return 0; | |
1483 | break; | |
1484 | } | |
1485 | } | |
1486 | } | |
1487 | ||
1488 | return dif; | |
1489 | } | |
1490 | ||
3ec4dd97 | 1491 | |
8018edd3 WD |
1492 | /* Return a copy of the full filename of a flist entry, using the indicated |
1493 | * buffer. | |
1494 | */ | |
b7736c79 | 1495 | char *f_name_to(struct file_struct *f, char *fbuf, int bsize) |
8018edd3 | 1496 | { |
ebed4c3a MP |
1497 | if (!f || !f->basename) |
1498 | return NULL; | |
3ec4dd97 | 1499 | |
3ec4dd97 | 1500 | if (f->dirname) { |
b7736c79 WD |
1501 | int off = strlcpy(fbuf, f->dirname, bsize); |
1502 | off += strlcpy(fbuf + off, "/", bsize - off); | |
1503 | strlcpy(fbuf + off, f->basename, bsize - off); | |
8018edd3 | 1504 | } else |
b7736c79 WD |
1505 | strlcpy(fbuf, f->basename, bsize); |
1506 | return fbuf; | |
8018edd3 | 1507 | } |
e03dfae5 | 1508 | |
3ec4dd97 | 1509 | |
8018edd3 WD |
1510 | /* Like f_name_to(), but we rotate through 5 static buffers of our own. |
1511 | */ | |
1512 | char *f_name(struct file_struct *f) | |
1513 | { | |
1514 | static char names[5][MAXPATHLEN]; | |
1515 | static unsigned int n; | |
1516 | ||
1517 | n = (n + 1) % (sizeof names / sizeof names[0]); | |
1518 | ||
1519 | return f_name_to(f, names[n], sizeof names[0]); | |
c627d613 | 1520 | } |