Commit | Line | Data |
---|---|---|
c627d613 AT |
1 | /* |
2 | Copyright (C) Andrew Tridgell 1996 | |
3 | Copyright (C) Paul Mackerras 1996 | |
4 | ||
5 | This program is free software; you can redistribute it and/or modify | |
6 | it under the terms of the GNU General Public License as published by | |
7 | the Free Software Foundation; either version 2 of the License, or | |
8 | (at your option) any later version. | |
9 | ||
10 | This program is distributed in the hope that it will be useful, | |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
13 | GNU General Public License for more details. | |
14 | ||
15 | You should have received a copy of the GNU General Public License | |
16 | along with this program; if not, write to the Free Software | |
17 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |
18 | */ | |
19 | ||
20 | /* generate and receive file lists */ | |
21 | ||
22 | #include "rsync.h" | |
23 | ||
a800434a AT |
24 | extern struct stats stats; |
25 | ||
c627d613 AT |
26 | extern int verbose; |
27 | extern int am_server; | |
28 | extern int always_checksum; | |
c627d613 AT |
29 | |
30 | extern int cvs_exclude; | |
31 | ||
a06d19e3 AT |
32 | extern int recurse; |
33 | ||
c627d613 AT |
34 | extern int one_file_system; |
35 | extern int make_backups; | |
36 | extern int preserve_links; | |
dc5ddbcc | 37 | extern int preserve_hard_links; |
c627d613 AT |
38 | extern int preserve_perms; |
39 | extern int preserve_devices; | |
40 | extern int preserve_uid; | |
41 | extern int preserve_gid; | |
42 | extern int preserve_times; | |
6574b4f7 | 43 | extern int relative_paths; |
82306bf6 | 44 | extern int copy_links; |
b5313607 | 45 | extern int copy_unsafe_links; |
f6c34742 | 46 | extern int remote_version; |
6ba9279f | 47 | extern int io_error; |
cb13abfe | 48 | extern int sanitize_paths; |
c627d613 | 49 | |
6902ed17 MP |
50 | extern int read_batch; |
51 | extern int write_batch; | |
52 | ||
b5313607 DD |
53 | static char topsrcname[MAXPATHLEN]; |
54 | ||
2b6b4d53 | 55 | static struct exclude_struct **local_exclude_list; |
c627d613 | 56 | |
3d382777 AT |
57 | static struct file_struct null_file; |
58 | ||
0199b05f AT |
59 | static void clean_flist(struct file_list *flist, int strip_root); |
60 | ||
5c66303a | 61 | static struct string_area *string_area_new(int size) |
3d382777 AT |
62 | { |
63 | struct string_area *a; | |
64 | ||
65 | if (size <= 0) size = ARENA_SIZE; | |
66 | a = malloc(sizeof(*a)); | |
67 | if (!a) out_of_memory("string_area_new"); | |
68 | a->current = a->base = malloc(size); | |
69 | if (!a->current) out_of_memory("string_area_new buffer"); | |
70 | a->end = a->base + size; | |
5c66303a | 71 | a->next = NULL; |
3d382777 AT |
72 | |
73 | return a; | |
74 | } | |
75 | ||
5c66303a | 76 | static void string_area_free(struct string_area *a) |
3d382777 AT |
77 | { |
78 | struct string_area *next; | |
79 | ||
80 | for ( ; a ; a = next) { | |
81 | next = a->next; | |
82 | free(a->base); | |
83 | } | |
84 | } | |
85 | ||
5c66303a | 86 | static char *string_area_malloc(struct string_area **ap, int size) |
3d382777 AT |
87 | { |
88 | char *p; | |
89 | struct string_area *a; | |
90 | ||
91 | /* does the request fit into the current space? */ | |
92 | a = *ap; | |
93 | if (a->current + size >= a->end) { | |
94 | /* no; get space, move new string_area to front of the list */ | |
95 | a = string_area_new(size > ARENA_SIZE ? size : ARENA_SIZE); | |
96 | a->next = *ap; | |
97 | *ap = a; | |
98 | } | |
99 | ||
100 | /* have space; do the "allocation." */ | |
101 | p = a->current; | |
102 | a->current += size; | |
103 | return p; | |
104 | } | |
105 | ||
5c66303a | 106 | static char *string_area_strdup(struct string_area **ap, const char *src) |
3d382777 AT |
107 | { |
108 | char* dest = string_area_malloc(ap, strlen(src) + 1); | |
109 | return strcpy(dest, src); | |
110 | } | |
f7632fc6 AT |
111 | |
112 | static void list_file_entry(struct file_struct *f) | |
113 | { | |
114 | char perms[11] = "----------"; | |
115 | char *perm_map = "rwxrwxrwx"; | |
116 | int i; | |
117 | ||
7212be92 DD |
118 | if (!f->basename) |
119 | /* this can happen if duplicate names were removed */ | |
120 | return; | |
121 | ||
f7632fc6 AT |
122 | for (i=0;i<9;i++) { |
123 | if (f->mode & (1<<i)) perms[9-i] = perm_map[8-i]; | |
124 | } | |
125 | if (S_ISLNK(f->mode)) perms[0] = 'l'; | |
126 | if (S_ISDIR(f->mode)) perms[0] = 'd'; | |
127 | if (S_ISBLK(f->mode)) perms[0] = 'b'; | |
128 | if (S_ISCHR(f->mode)) perms[0] = 'c'; | |
129 | if (S_ISSOCK(f->mode)) perms[0] = 's'; | |
130 | if (S_ISFIFO(f->mode)) perms[0] = 'p'; | |
131 | ||
132 | if (preserve_links && S_ISLNK(f->mode)) { | |
133 | rprintf(FINFO,"%s %11.0f %s %s -> %s\n", | |
134 | perms, | |
135 | (double)f->length, timestring(f->modtime), | |
136 | f_name(f), f->link); | |
137 | } else { | |
138 | rprintf(FINFO,"%s %11.0f %s %s\n", | |
139 | perms, | |
140 | (double)f->length, timestring(f->modtime), f_name(f)); | |
141 | } | |
142 | } | |
143 | ||
144 | ||
b5313607 DD |
145 | int readlink_stat(const char *Path, STRUCT_STAT *Buffer, char *Linkbuf) |
146 | { | |
147 | #if SUPPORT_LINKS | |
148 | if (copy_links) { | |
149 | return do_stat(Path, Buffer); | |
150 | } | |
151 | if (do_lstat(Path, Buffer) == -1) { | |
152 | return -1; | |
153 | } | |
154 | if (S_ISLNK(Buffer->st_mode)) { | |
ab94af5c MP |
155 | int l; |
156 | if ((l = readlink((char *) Path, Linkbuf, MAXPATHLEN-1))== -1) { | |
b5313607 DD |
157 | return -1; |
158 | } | |
159 | Linkbuf[l] = 0; | |
160 | if (copy_unsafe_links && (topsrcname[0] != '\0') && | |
161 | unsafe_symlink(Linkbuf, topsrcname)) { | |
162 | return do_stat(Path, Buffer); | |
163 | } | |
164 | } | |
165 | return 0; | |
166 | #else | |
167 | return do_stat(Path, Buffer); | |
168 | #endif | |
169 | } | |
170 | ||
bcacc18b | 171 | int link_stat(const char *Path, STRUCT_STAT *Buffer) |
82306bf6 AT |
172 | { |
173 | #if SUPPORT_LINKS | |
174 | if (copy_links) { | |
bcacc18b | 175 | return do_stat(Path, Buffer); |
82306bf6 | 176 | } else { |
bcacc18b | 177 | return do_lstat(Path, Buffer); |
82306bf6 AT |
178 | } |
179 | #else | |
bcacc18b | 180 | return do_stat(Path, Buffer); |
82306bf6 AT |
181 | #endif |
182 | } | |
183 | ||
c627d613 AT |
184 | /* |
185 | This function is used to check if a file should be included/excluded | |
186 | from the list of files based on its name and type etc | |
187 | */ | |
bcacc18b | 188 | static int match_file_name(char *fname,STRUCT_STAT *st) |
c627d613 | 189 | { |
2b6b4d53 | 190 | if (check_exclude(fname,local_exclude_list,st)) { |
c627d613 AT |
191 | return 0; |
192 | } | |
193 | return 1; | |
194 | } | |
195 | ||
196 | /* used by the one_file_system code */ | |
197 | static dev_t filesystem_dev; | |
198 | ||
199 | static void set_filesystem(char *fname) | |
200 | { | |
bcacc18b | 201 | STRUCT_STAT st; |
82306bf6 | 202 | if (link_stat(fname,&st) != 0) return; |
c627d613 AT |
203 | filesystem_dev = st.st_dev; |
204 | } | |
205 | ||
206 | ||
b280a1f4 AT |
207 | static int to_wire_mode(mode_t mode) |
208 | { | |
efe3037c | 209 | if (S_ISLNK(mode) && (_S_IFLNK != 0120000)) { |
b280a1f4 AT |
210 | return (mode & ~(_S_IFMT)) | 0120000; |
211 | } | |
212 | return (int)mode; | |
213 | } | |
214 | ||
215 | static mode_t from_wire_mode(int mode) | |
216 | { | |
efe3037c AT |
217 | if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000)) { |
218 | return (mode & ~(_S_IFMT)) | _S_IFLNK; | |
b280a1f4 AT |
219 | } |
220 | return (mode_t)mode; | |
221 | } | |
222 | ||
223 | ||
c627d613 AT |
224 | static void send_directory(int f,struct file_list *flist,char *dir); |
225 | ||
3a6a366f | 226 | static char *flist_dir; |
c627d613 | 227 | |
3ec4dd97 | 228 | |
6e4fb64e | 229 | static void send_file_entry(struct file_struct *file,int f,unsigned base_flags) |
c627d613 | 230 | { |
72914a60 AT |
231 | unsigned char flags; |
232 | static time_t last_time; | |
233 | static mode_t last_mode; | |
234 | static dev_t last_rdev; | |
235 | static uid_t last_uid; | |
236 | static gid_t last_gid; | |
237 | static char lastname[MAXPATHLEN]; | |
238 | char *fname; | |
239 | int l1,l2; | |
240 | ||
241 | if (f == -1) return; | |
242 | ||
243 | if (!file) { | |
244 | write_byte(f,0); | |
245 | return; | |
246 | } | |
247 | ||
248 | fname = f_name(file); | |
249 | ||
250 | flags = base_flags; | |
251 | ||
252 | if (file->mode == last_mode) flags |= SAME_MODE; | |
253 | if (file->rdev == last_rdev) flags |= SAME_RDEV; | |
254 | if (file->uid == last_uid) flags |= SAME_UID; | |
255 | if (file->gid == last_gid) flags |= SAME_GID; | |
256 | if (file->modtime == last_time) flags |= SAME_TIME; | |
257 | ||
258 | for (l1=0;lastname[l1] && (fname[l1] == lastname[l1]) && (l1 < 255);l1++) ; | |
259 | l2 = strlen(fname) - l1; | |
260 | ||
261 | if (l1 > 0) flags |= SAME_NAME; | |
262 | if (l2 > 255) flags |= LONG_NAME; | |
263 | ||
264 | /* we must make sure we don't send a zero flags byte or the other | |
265 | end will terminate the flist transfer */ | |
266 | if (flags == 0 && !S_ISDIR(file->mode)) flags |= FLAG_DELETE; | |
267 | if (flags == 0) flags |= LONG_NAME; | |
268 | ||
269 | write_byte(f,flags); | |
270 | if (flags & SAME_NAME) | |
271 | write_byte(f,l1); | |
272 | if (flags & LONG_NAME) | |
273 | write_int(f,l2); | |
274 | else | |
275 | write_byte(f,l2); | |
276 | write_buf(f,fname+l1,l2); | |
277 | ||
278 | write_longint(f,file->length); | |
279 | if (!(flags & SAME_TIME)) | |
280 | write_int(f,(int)file->modtime); | |
281 | if (!(flags & SAME_MODE)) | |
b280a1f4 | 282 | write_int(f,to_wire_mode(file->mode)); |
72914a60 AT |
283 | if (preserve_uid && !(flags & SAME_UID)) { |
284 | add_uid(file->uid); | |
285 | write_int(f,(int)file->uid); | |
286 | } | |
287 | if (preserve_gid && !(flags & SAME_GID)) { | |
288 | add_gid(file->gid); | |
289 | write_int(f,(int)file->gid); | |
290 | } | |
291 | if (preserve_devices && IS_DEVICE(file->mode) && !(flags & SAME_RDEV)) | |
292 | write_int(f,(int)file->rdev); | |
c627d613 AT |
293 | |
294 | #if SUPPORT_LINKS | |
72914a60 AT |
295 | if (preserve_links && S_ISLNK(file->mode)) { |
296 | write_int(f,strlen(file->link)); | |
297 | write_buf(f,file->link,strlen(file->link)); | |
298 | } | |
c627d613 AT |
299 | #endif |
300 | ||
dc5ddbcc | 301 | #if SUPPORT_HARD_LINKS |
72914a60 AT |
302 | if (preserve_hard_links && S_ISREG(file->mode)) { |
303 | write_int(f,(int)file->dev); | |
304 | write_int(f,(int)file->inode); | |
305 | } | |
dc5ddbcc AT |
306 | #endif |
307 | ||
72914a60 | 308 | if (always_checksum) { |
f855a7d0 AT |
309 | if (remote_version < 21) { |
310 | write_buf(f,file->sum,2); | |
311 | } else { | |
312 | write_buf(f,file->sum,MD4_SUM_LENGTH); | |
313 | } | |
72914a60 | 314 | } |
182dca5c | 315 | |
72914a60 AT |
316 | last_mode = file->mode; |
317 | last_rdev = file->rdev; | |
318 | last_uid = file->uid; | |
319 | last_gid = file->gid; | |
320 | last_time = file->modtime; | |
4fe159a8 | 321 | |
37f9805d | 322 | strlcpy(lastname,fname,MAXPATHLEN); |
72914a60 | 323 | lastname[MAXPATHLEN-1] = 0; |
182dca5c AT |
324 | } |
325 | ||
326 | ||
327 | ||
3333ffbd AT |
328 | static void receive_file_entry(struct file_struct **fptr, |
329 | unsigned flags,int f) | |
182dca5c | 330 | { |
72914a60 AT |
331 | static time_t last_time; |
332 | static mode_t last_mode; | |
333 | static dev_t last_rdev; | |
334 | static uid_t last_uid; | |
335 | static gid_t last_gid; | |
336 | static char lastname[MAXPATHLEN]; | |
337 | char thisname[MAXPATHLEN]; | |
338 | int l1=0,l2=0; | |
339 | char *p; | |
340 | struct file_struct *file; | |
341 | ||
342 | if (flags & SAME_NAME) | |
343 | l1 = read_byte(f); | |
4fe159a8 | 344 | |
72914a60 AT |
345 | if (flags & LONG_NAME) |
346 | l2 = read_int(f); | |
347 | else | |
348 | l2 = read_byte(f); | |
349 | ||
350 | file = (struct file_struct *)malloc(sizeof(*file)); | |
351 | if (!file) out_of_memory("receive_file_entry"); | |
352 | memset((char *)file, 0, sizeof(*file)); | |
353 | (*fptr) = file; | |
354 | ||
d0fd26aa AT |
355 | if (l2 >= MAXPATHLEN-l1) { |
356 | rprintf(FERROR,"overflow: flags=0x%x l1=%d l2=%d lastname=%s\n", | |
357 | flags, l1, l2, lastname); | |
358 | overflow("receive_file_entry"); | |
359 | } | |
72914a60 | 360 | |
37f9805d | 361 | strlcpy(thisname,lastname,l1+1); |
72914a60 AT |
362 | read_sbuf(f,&thisname[l1],l2); |
363 | thisname[l1+l2] = 0; | |
364 | ||
37f9805d | 365 | strlcpy(lastname,thisname,MAXPATHLEN); |
72914a60 AT |
366 | lastname[MAXPATHLEN-1] = 0; |
367 | ||
368 | clean_fname(thisname); | |
369 | ||
cb13abfe DD |
370 | if (sanitize_paths) { |
371 | sanitize_path(thisname, NULL); | |
372 | } | |
373 | ||
72914a60 AT |
374 | if ((p = strrchr(thisname,'/'))) { |
375 | static char *lastdir; | |
376 | *p = 0; | |
377 | if (lastdir && strcmp(thisname, lastdir)==0) { | |
378 | file->dirname = lastdir; | |
379 | } else { | |
380 | file->dirname = strdup(thisname); | |
381 | lastdir = file->dirname; | |
382 | } | |
383 | file->basename = strdup(p+1); | |
384 | } else { | |
385 | file->dirname = NULL; | |
386 | file->basename = strdup(thisname); | |
387 | } | |
388 | ||
389 | if (!file->basename) out_of_memory("receive_file_entry 1"); | |
390 | ||
391 | ||
392 | file->flags = flags; | |
393 | file->length = read_longint(f); | |
394 | file->modtime = (flags & SAME_TIME) ? last_time : (time_t)read_int(f); | |
b280a1f4 | 395 | file->mode = (flags & SAME_MODE) ? last_mode : from_wire_mode(read_int(f)); |
72914a60 AT |
396 | if (preserve_uid) |
397 | file->uid = (flags & SAME_UID) ? last_uid : (uid_t)read_int(f); | |
398 | if (preserve_gid) | |
399 | file->gid = (flags & SAME_GID) ? last_gid : (gid_t)read_int(f); | |
400 | if (preserve_devices && IS_DEVICE(file->mode)) | |
401 | file->rdev = (flags & SAME_RDEV) ? last_rdev : (dev_t)read_int(f); | |
402 | ||
403 | if (preserve_links && S_ISLNK(file->mode)) { | |
404 | int l = read_int(f); | |
405 | file->link = (char *)malloc(l+1); | |
406 | if (!file->link) out_of_memory("receive_file_entry 2"); | |
407 | read_sbuf(f,file->link,l); | |
cb13abfe DD |
408 | if (sanitize_paths) { |
409 | sanitize_path(file->link, file->dirname); | |
410 | } | |
72914a60 | 411 | } |
dc5ddbcc AT |
412 | |
413 | #if SUPPORT_HARD_LINKS | |
72914a60 AT |
414 | if (preserve_hard_links && S_ISREG(file->mode)) { |
415 | file->dev = read_int(f); | |
416 | file->inode = read_int(f); | |
417 | } | |
dc5ddbcc | 418 | #endif |
182dca5c | 419 | |
72914a60 AT |
420 | if (always_checksum) { |
421 | file->sum = (char *)malloc(MD4_SUM_LENGTH); | |
422 | if (!file->sum) out_of_memory("md4 sum"); | |
f855a7d0 AT |
423 | if (remote_version < 21) { |
424 | read_buf(f,file->sum,2); | |
425 | } else { | |
426 | read_buf(f,file->sum,MD4_SUM_LENGTH); | |
427 | } | |
72914a60 | 428 | } |
182dca5c | 429 | |
72914a60 AT |
430 | last_mode = file->mode; |
431 | last_rdev = file->rdev; | |
432 | last_uid = file->uid; | |
433 | last_gid = file->gid; | |
434 | last_time = file->modtime; | |
435 | ||
436 | if (!preserve_perms) { | |
437 | extern int orig_umask; | |
438 | /* set an appropriate set of permissions based on original | |
439 | permissions and umask. This emulates what GNU cp does */ | |
440 | file->mode &= ~orig_umask; | |
441 | } | |
c627d613 AT |
442 | } |
443 | ||
444 | ||
0c5f37d9 AT |
445 | /* determine if a file in a different filesstem should be skipped |
446 | when one_file_system is set. We bascally only want to include | |
447 | the mount points - but they can be hard to find! */ | |
bcacc18b | 448 | static int skip_filesystem(char *fname, STRUCT_STAT *st) |
0c5f37d9 | 449 | { |
bcacc18b | 450 | STRUCT_STAT st2; |
0c5f37d9 AT |
451 | char *p = strrchr(fname, '/'); |
452 | ||
453 | /* skip all but directories */ | |
454 | if (!S_ISDIR(st->st_mode)) return 1; | |
455 | ||
456 | /* if its not a subdirectory then allow */ | |
457 | if (!p) return 0; | |
458 | ||
459 | *p = 0; | |
460 | if (link_stat(fname, &st2)) { | |
461 | *p = '/'; | |
462 | return 0; | |
463 | } | |
464 | *p = '/'; | |
465 | ||
466 | return (st2.st_dev != filesystem_dev); | |
467 | } | |
4fe159a8 | 468 | |
3d382777 AT |
469 | #define STRDUP(ap, p) (ap ? string_area_strdup(ap, p) : strdup(p)) |
470 | #define MALLOC(ap, i) (ap ? string_area_malloc(ap, i) : malloc(i)) | |
471 | ||
66203a98 | 472 | /* create a file_struct for a named file */ |
ac1a0994 AT |
473 | struct file_struct *make_file(int f, char *fname, struct string_area **ap, |
474 | int noexcludes) | |
c627d613 | 475 | { |
3ec4dd97 | 476 | struct file_struct *file; |
bcacc18b | 477 | STRUCT_STAT st; |
3ec4dd97 AT |
478 | char sum[SUM_LENGTH]; |
479 | char *p; | |
480 | char cleaned_name[MAXPATHLEN]; | |
b5313607 | 481 | char linkbuf[MAXPATHLEN]; |
b33b791e | 482 | extern int delete_excluded; |
ac1a0994 | 483 | extern int module_id; |
3ec4dd97 | 484 | |
37f9805d | 485 | strlcpy(cleaned_name, fname, MAXPATHLEN); |
3ec4dd97 AT |
486 | cleaned_name[MAXPATHLEN-1] = 0; |
487 | clean_fname(cleaned_name); | |
cb13abfe DD |
488 | if (sanitize_paths) { |
489 | sanitize_path(cleaned_name, NULL); | |
490 | } | |
3ec4dd97 AT |
491 | fname = cleaned_name; |
492 | ||
f5780433 | 493 | memset(sum,0,SUM_LENGTH); |
3ec4dd97 | 494 | |
b5313607 | 495 | if (readlink_stat(fname,&st,linkbuf) != 0) { |
6ba9279f | 496 | io_error = 1; |
f76933b1 | 497 | rprintf(FERROR,"readlink %s: %s\n", |
3ec4dd97 AT |
498 | fname,strerror(errno)); |
499 | return NULL; | |
500 | } | |
c627d613 | 501 | |
ac1a0994 AT |
502 | /* we use noexcludes from backup.c */ |
503 | if (noexcludes) goto skip_excludes; | |
504 | ||
3ec4dd97 | 505 | if (S_ISDIR(st.st_mode) && !recurse) { |
9486289c | 506 | rprintf(FINFO,"skipping directory %s\n",fname); |
3ec4dd97 AT |
507 | return NULL; |
508 | } | |
509 | ||
0c5f37d9 AT |
510 | if (one_file_system && st.st_dev != filesystem_dev) { |
511 | if (skip_filesystem(fname, &st)) | |
512 | return NULL; | |
513 | } | |
3ec4dd97 | 514 | |
b33b791e DD |
515 | /* f is set to -1 when calculating deletion file list */ |
516 | if (((f != -1) || !delete_excluded) && !match_file_name(fname,&st)) | |
3ec4dd97 | 517 | return NULL; |
ac1a0994 AT |
518 | |
519 | ||
520 | if (lp_ignore_nonreadable(module_id) && access(fname, R_OK) != 0) | |
521 | return NULL; | |
522 | ||
523 | skip_excludes: | |
524 | ||
3ec4dd97 | 525 | if (verbose > 2) |
b33b791e | 526 | rprintf(FINFO,"make_file(%d,%s)\n",f,fname); |
3ec4dd97 AT |
527 | |
528 | file = (struct file_struct *)malloc(sizeof(*file)); | |
529 | if (!file) out_of_memory("make_file"); | |
f5780433 | 530 | memset((char *)file,0,sizeof(*file)); |
3ec4dd97 AT |
531 | |
532 | if ((p = strrchr(fname,'/'))) { | |
533 | static char *lastdir; | |
534 | *p = 0; | |
535 | if (lastdir && strcmp(fname, lastdir)==0) { | |
536 | file->dirname = lastdir; | |
537 | } else { | |
a20aa42a | 538 | file->dirname = strdup(fname); |
3ec4dd97 AT |
539 | lastdir = file->dirname; |
540 | } | |
3d382777 | 541 | file->basename = STRDUP(ap, p+1); |
3ec4dd97 AT |
542 | *p = '/'; |
543 | } else { | |
544 | file->dirname = NULL; | |
3d382777 | 545 | file->basename = STRDUP(ap, fname); |
3ec4dd97 | 546 | } |
c627d613 | 547 | |
3ec4dd97 AT |
548 | file->modtime = st.st_mtime; |
549 | file->length = st.st_size; | |
550 | file->mode = st.st_mode; | |
551 | file->uid = st.st_uid; | |
552 | file->gid = st.st_gid; | |
553 | file->dev = st.st_dev; | |
554 | file->inode = st.st_ino; | |
c627d613 | 555 | #ifdef HAVE_ST_RDEV |
3ec4dd97 | 556 | file->rdev = st.st_rdev; |
c627d613 AT |
557 | #endif |
558 | ||
559 | #if SUPPORT_LINKS | |
3ec4dd97 | 560 | if (S_ISLNK(st.st_mode)) { |
3d382777 | 561 | file->link = STRDUP(ap, linkbuf); |
3ec4dd97 | 562 | } |
c627d613 AT |
563 | #endif |
564 | ||
1250f24e | 565 | if (always_checksum) { |
3d382777 | 566 | file->sum = (char *)MALLOC(ap, MD4_SUM_LENGTH); |
2d0bb8eb | 567 | if (!file->sum) out_of_memory("md4 sum"); |
1250f24e AT |
568 | /* drat. we have to provide a null checksum for non-regular |
569 | files in order to be compatible with earlier versions | |
570 | of rsync */ | |
571 | if (S_ISREG(st.st_mode)) { | |
572 | file_checksum(fname,file->sum,st.st_size); | |
573 | } else { | |
574 | memset(file->sum, 0, MD4_SUM_LENGTH); | |
575 | } | |
3ec4dd97 | 576 | } |
c627d613 | 577 | |
3ec4dd97 AT |
578 | if (flist_dir) { |
579 | static char *lastdir; | |
580 | if (lastdir && strcmp(lastdir, flist_dir)==0) { | |
581 | file->basedir = lastdir; | |
582 | } else { | |
a20aa42a | 583 | file->basedir = strdup(flist_dir); |
3ec4dd97 AT |
584 | lastdir = file->basedir; |
585 | } | |
586 | } else { | |
587 | file->basedir = NULL; | |
588 | } | |
c627d613 | 589 | |
3ec4dd97 | 590 | if (!S_ISDIR(st.st_mode)) |
a800434a | 591 | stats.total_size += st.st_size; |
c627d613 | 592 | |
3ec4dd97 | 593 | return file; |
c627d613 AT |
594 | } |
595 | ||
596 | ||
597 | ||
2bca43f6 | 598 | void send_file_name(int f,struct file_list *flist,char *fname, |
3333ffbd | 599 | int recursive, unsigned base_flags) |
c627d613 AT |
600 | { |
601 | struct file_struct *file; | |
602 | ||
ac1a0994 | 603 | file = make_file(f,fname, &flist->string_area, 0); |
c627d613 AT |
604 | |
605 | if (!file) return; | |
606 | ||
607 | if (flist->count >= flist->malloced) { | |
3ec4dd97 AT |
608 | if (flist->malloced < 1000) |
609 | flist->malloced += 1000; | |
f9c51620 | 610 | else |
3ec4dd97 AT |
611 | flist->malloced *= 2; |
612 | flist->files = (struct file_struct **)realloc(flist->files, | |
613 | sizeof(flist->files[0])* | |
614 | flist->malloced); | |
f9c51620 AT |
615 | if (!flist->files) |
616 | out_of_memory("send_file_name"); | |
c627d613 AT |
617 | } |
618 | ||
6902ed17 MP |
619 | if (write_batch) /* dw */ |
620 | file->flags = FLAG_DELETE; | |
621 | ||
3ec4dd97 AT |
622 | if (strcmp(file->basename,"")) { |
623 | flist->files[flist->count++] = file; | |
3333ffbd | 624 | send_file_entry(file,f,base_flags); |
c627d613 AT |
625 | } |
626 | ||
649d65ed | 627 | if (S_ISDIR(file->mode) && recursive) { |
2b6b4d53 AT |
628 | struct exclude_struct **last_exclude_list = local_exclude_list; |
629 | send_directory(f,flist,f_name(file)); | |
630 | local_exclude_list = last_exclude_list; | |
631 | return; | |
c627d613 AT |
632 | } |
633 | } | |
634 | ||
635 | ||
636 | ||
637 | static void send_directory(int f,struct file_list *flist,char *dir) | |
638 | { | |
3ec4dd97 AT |
639 | DIR *d; |
640 | struct dirent *di; | |
641 | char fname[MAXPATHLEN]; | |
642 | int l; | |
643 | char *p; | |
644 | ||
645 | d = opendir(dir); | |
646 | if (!d) { | |
6ba9279f | 647 | io_error = 1; |
2f7512b0 | 648 | rprintf(FERROR,"opendir(%s): %s\n", |
3ec4dd97 AT |
649 | dir,strerror(errno)); |
650 | return; | |
651 | } | |
c627d613 | 652 | |
37f9805d | 653 | strlcpy(fname,dir,MAXPATHLEN); |
3ec4dd97 AT |
654 | l = strlen(fname); |
655 | if (fname[l-1] != '/') { | |
656 | if (l == MAXPATHLEN-1) { | |
6ba9279f | 657 | io_error = 1; |
9486289c | 658 | rprintf(FERROR,"skipping long-named directory %s\n",fname); |
3ec4dd97 AT |
659 | closedir(d); |
660 | return; | |
661 | } | |
37f9805d | 662 | strlcat(fname,"/", MAXPATHLEN); |
3ec4dd97 AT |
663 | l++; |
664 | } | |
665 | p = fname + strlen(fname); | |
c627d613 | 666 | |
3d913675 AT |
667 | local_exclude_list = NULL; |
668 | ||
3ec4dd97 AT |
669 | if (cvs_exclude) { |
670 | if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN-1) { | |
671 | strcpy(p,".cvsignore"); | |
2b6b4d53 | 672 | local_exclude_list = make_exclude_list(fname,NULL,0,0); |
3ec4dd97 | 673 | } else { |
6ba9279f | 674 | io_error = 1; |
9486289c | 675 | rprintf(FINFO,"cannot cvs-exclude in long-named directory %s\n",fname); |
3ec4dd97 AT |
676 | } |
677 | } | |
678 | ||
679 | for (di=readdir(d); di; di=readdir(d)) { | |
d6e6ecbd AT |
680 | char *dname = d_name(di); |
681 | if (strcmp(dname,".")==0 || | |
682 | strcmp(dname,"..")==0) | |
3ec4dd97 | 683 | continue; |
37f9805d | 684 | strlcpy(p,dname,MAXPATHLEN-l); |
7b1ce0d7 | 685 | send_file_name(f,flist,fname,recurse,0); |
3ec4dd97 | 686 | } |
c627d613 | 687 | |
3d913675 AT |
688 | if (local_exclude_list) { |
689 | add_exclude_list("!", &local_exclude_list, 0); | |
690 | } | |
691 | ||
3ec4dd97 | 692 | closedir(d); |
c627d613 AT |
693 | } |
694 | ||
695 | ||
a06d19e3 | 696 | struct file_list *send_file_list(int f,int argc,char *argv[]) |
c627d613 | 697 | { |
649d65ed | 698 | int i,l; |
bcacc18b | 699 | STRUCT_STAT st; |
2bca43f6 | 700 | char *p,*dir,*olddir; |
649d65ed AT |
701 | char lastpath[MAXPATHLEN]=""; |
702 | struct file_list *flist; | |
a800434a | 703 | int64 start_write; |
649d65ed AT |
704 | |
705 | if (verbose && recurse && !am_server && f != -1) { | |
9486289c | 706 | rprintf(FINFO,"building file list ... "); |
d567322f MP |
707 | if (verbose > 1) |
708 | rprintf(FINFO, "\n"); | |
9486289c | 709 | rflush(FINFO); |
649d65ed | 710 | } |
c627d613 | 711 | |
a800434a AT |
712 | start_write = stats.total_written; |
713 | ||
3d382777 | 714 | flist = flist_new(); |
c627d613 | 715 | |
d6dead6b AT |
716 | if (f != -1) { |
717 | io_start_buffering(f); | |
718 | } | |
719 | ||
649d65ed | 720 | for (i=0;i<argc;i++) { |
b5313607 | 721 | char *fname = topsrcname; |
c627d613 | 722 | |
37f9805d | 723 | strlcpy(fname,argv[i],MAXPATHLEN); |
c627d613 | 724 | |
649d65ed AT |
725 | l = strlen(fname); |
726 | if (l != 1 && fname[l-1] == '/') { | |
53f821f1 DD |
727 | if ((l == 2) && (fname[0] == '.')) { |
728 | /* Turn ./ into just . rather than ./. | |
729 | This was put in to avoid a problem with | |
730 | rsync -aR --delete from ./ | |
731 | The send_file_name() below of ./ was | |
732 | mysteriously preventing deletes */ | |
733 | fname[1] = 0; | |
734 | } else { | |
735 | strlcat(fname,".",MAXPATHLEN); | |
736 | } | |
649d65ed | 737 | } |
c627d613 | 738 | |
649d65ed | 739 | if (link_stat(fname,&st) != 0) { |
f76933b1 AT |
740 | if (f != -1) { |
741 | io_error=1; | |
742 | rprintf(FERROR,"link_stat %s : %s\n",fname,strerror(errno)); | |
743 | } | |
649d65ed AT |
744 | continue; |
745 | } | |
c627d613 | 746 | |
649d65ed | 747 | if (S_ISDIR(st.st_mode) && !recurse) { |
9486289c | 748 | rprintf(FINFO,"skipping directory %s\n",fname); |
649d65ed AT |
749 | continue; |
750 | } | |
c627d613 | 751 | |
649d65ed | 752 | dir = NULL; |
2bca43f6 | 753 | olddir = NULL; |
649d65ed AT |
754 | |
755 | if (!relative_paths) { | |
756 | p = strrchr(fname,'/'); | |
757 | if (p) { | |
758 | *p = 0; | |
759 | if (p == fname) | |
760 | dir = "/"; | |
761 | else | |
762 | dir = fname; | |
763 | fname = p+1; | |
764 | } | |
765 | } else if (f != -1 && (p=strrchr(fname,'/'))) { | |
766 | /* this ensures we send the intermediate directories, | |
767 | thus getting their permissions right */ | |
768 | *p = 0; | |
769 | if (strcmp(lastpath,fname)) { | |
37f9805d | 770 | strlcpy(lastpath, fname, sizeof(lastpath)); |
649d65ed AT |
771 | *p = '/'; |
772 | for (p=fname+1; (p=strchr(p,'/')); p++) { | |
6c82f74b | 773 | int copy_links_saved = copy_links; |
245fbb51 | 774 | int recurse_saved = recurse; |
649d65ed | 775 | *p = 0; |
b5313607 | 776 | copy_links = copy_unsafe_links; |
245fbb51 DD |
777 | /* set recurse to 1 to prevent make_file |
778 | from ignoring directory, but still | |
779 | turn off the recursive parameter to | |
780 | send_file_name */ | |
781 | recurse = 1; | |
3333ffbd | 782 | send_file_name(f, flist, fname, 0, 0); |
6c82f74b | 783 | copy_links = copy_links_saved; |
245fbb51 | 784 | recurse = recurse_saved; |
649d65ed AT |
785 | *p = '/'; |
786 | } | |
787 | } else { | |
788 | *p = '/'; | |
789 | } | |
790 | } | |
791 | ||
792 | if (!*fname) | |
793 | fname = "."; | |
794 | ||
795 | if (dir && *dir) { | |
2bca43f6 | 796 | olddir = push_dir(dir, 1); |
5243c216 AT |
797 | |
798 | if (!olddir) { | |
6ba9279f | 799 | io_error=1; |
5243c216 | 800 | rprintf(FERROR,"push_dir %s : %s\n", |
649d65ed AT |
801 | dir,strerror(errno)); |
802 | continue; | |
803 | } | |
5243c216 | 804 | |
649d65ed | 805 | flist_dir = dir; |
2bca43f6 DD |
806 | } |
807 | ||
808 | if (one_file_system) | |
809 | set_filesystem(fname); | |
810 | ||
b315601c | 811 | send_file_name(f,flist,fname,recurse,FLAG_DELETE); |
2bca43f6 DD |
812 | |
813 | if (olddir != NULL) { | |
649d65ed | 814 | flist_dir = NULL; |
5243c216 AT |
815 | if (pop_dir(olddir) != 0) { |
816 | rprintf(FERROR,"pop_dir %s : %s\n", | |
817 | dir,strerror(errno)); | |
65417579 | 818 | exit_cleanup(RERR_FILESELECT); |
649d65ed | 819 | } |
649d65ed | 820 | } |
649d65ed | 821 | } |
dc5ddbcc | 822 | |
b5313607 DD |
823 | topsrcname[0] = '\0'; |
824 | ||
649d65ed | 825 | if (f != -1) { |
3333ffbd | 826 | send_file_entry(NULL,f,0); |
649d65ed | 827 | } |
c627d613 | 828 | |
649d65ed | 829 | if (verbose && recurse && !am_server && f != -1) |
9486289c | 830 | rprintf(FINFO,"done\n"); |
649d65ed | 831 | |
0199b05f | 832 | clean_flist(flist, 0); |
649d65ed AT |
833 | |
834 | /* now send the uid/gid list. This was introduced in protocol | |
835 | version 15 */ | |
836 | if (f != -1 && remote_version >= 15) { | |
837 | send_uid_list(f); | |
838 | } | |
f6c34742 | 839 | |
6ba9279f AT |
840 | /* if protocol version is >= 17 then send the io_error flag */ |
841 | if (f != -1 && remote_version >= 17) { | |
cda2ae84 AT |
842 | extern int module_id; |
843 | write_int(f, lp_ignore_errors(module_id)? 0 : io_error); | |
6ba9279f AT |
844 | } |
845 | ||
d6dead6b AT |
846 | if (f != -1) { |
847 | io_end_buffering(f); | |
a800434a AT |
848 | stats.flist_size = stats.total_written - start_write; |
849 | stats.num_files = flist->count; | |
6902ed17 MP |
850 | if (write_batch) /* dw */ |
851 | write_batch_flist_info(flist->count, flist->files); | |
d6dead6b AT |
852 | } |
853 | ||
17faa41c | 854 | if (verbose > 2) |
9486289c | 855 | rprintf(FINFO,"send_file_list done\n"); |
17faa41c | 856 | |
649d65ed | 857 | return flist; |
c627d613 AT |
858 | } |
859 | ||
860 | ||
861 | struct file_list *recv_file_list(int f) | |
862 | { | |
c627d613 | 863 | struct file_list *flist; |
182dca5c | 864 | unsigned char flags; |
a800434a | 865 | int64 start_read; |
f7632fc6 | 866 | extern int list_only; |
c627d613 | 867 | |
a06d19e3 | 868 | if (verbose && recurse && !am_server) { |
9486289c AT |
869 | rprintf(FINFO,"receiving file list ... "); |
870 | rflush(FINFO); | |
a06d19e3 | 871 | } |
c627d613 | 872 | |
a800434a AT |
873 | start_read = stats.total_read; |
874 | ||
c627d613 AT |
875 | flist = (struct file_list *)malloc(sizeof(flist[0])); |
876 | if (!flist) | |
877 | goto oom; | |
878 | ||
879 | flist->count=0; | |
3ec4dd97 AT |
880 | flist->malloced=1000; |
881 | flist->files = (struct file_struct **)malloc(sizeof(flist->files[0])* | |
882 | flist->malloced); | |
c627d613 AT |
883 | if (!flist->files) |
884 | goto oom; | |
885 | ||
886 | ||
182dca5c | 887 | for (flags=read_byte(f); flags; flags=read_byte(f)) { |
c627d613 AT |
888 | int i = flist->count; |
889 | ||
890 | if (i >= flist->malloced) { | |
3ec4dd97 AT |
891 | if (flist->malloced < 1000) |
892 | flist->malloced += 1000; | |
f9c51620 | 893 | else |
3ec4dd97 AT |
894 | flist->malloced *= 2; |
895 | flist->files =(struct file_struct **)realloc(flist->files, | |
896 | sizeof(flist->files[0])* | |
897 | flist->malloced); | |
f9c51620 AT |
898 | if (!flist->files) |
899 | goto oom; | |
c627d613 AT |
900 | } |
901 | ||
182dca5c | 902 | receive_file_entry(&flist->files[i],flags,f); |
c627d613 | 903 | |
3ec4dd97 | 904 | if (S_ISREG(flist->files[i]->mode)) |
a800434a | 905 | stats.total_size += flist->files[i]->length; |
c627d613 AT |
906 | |
907 | flist->count++; | |
908 | ||
909 | if (verbose > 2) | |
9486289c | 910 | rprintf(FINFO,"recv_file_name(%s)\n",f_name(flist->files[i])); |
c627d613 AT |
911 | } |
912 | ||
913 | ||
914 | if (verbose > 2) | |
9486289c | 915 | rprintf(FINFO,"received %d names\n",flist->count); |
c627d613 | 916 | |
0199b05f | 917 | clean_flist(flist, relative_paths); |
c627d613 | 918 | |
a06d19e3 | 919 | if (verbose && recurse && !am_server) { |
9486289c | 920 | rprintf(FINFO,"done\n"); |
a06d19e3 AT |
921 | } |
922 | ||
f6c34742 AT |
923 | /* now recv the uid/gid list. This was introduced in protocol version 15 */ |
924 | if (f != -1 && remote_version >= 15) { | |
925 | recv_uid_list(f, flist); | |
926 | } | |
927 | ||
6ba9279f | 928 | /* if protocol version is >= 17 then recv the io_error flag */ |
6902ed17 | 929 | if (f != -1 && remote_version >= 17 && !read_batch) { /* dw-added readbatch */ |
cda2ae84 | 930 | extern int module_id; |
ef55c686 AT |
931 | extern int ignore_errors; |
932 | if (lp_ignore_errors(module_id) || ignore_errors) { | |
cda2ae84 AT |
933 | read_int(f); |
934 | } else { | |
935 | io_error |= read_int(f); | |
936 | } | |
6ba9279f AT |
937 | } |
938 | ||
f7632fc6 AT |
939 | if (list_only) { |
940 | int i; | |
941 | for (i=0;i<flist->count;i++) { | |
942 | list_file_entry(flist->files[i]); | |
943 | } | |
944 | } | |
945 | ||
946 | ||
17faa41c | 947 | if (verbose > 2) |
9486289c | 948 | rprintf(FINFO,"recv_file_list done\n"); |
17faa41c | 949 | |
a800434a AT |
950 | stats.flist_size = stats.total_read - start_read; |
951 | stats.num_files = flist->count; | |
952 | ||
c627d613 AT |
953 | return flist; |
954 | ||
955 | oom: | |
956 | out_of_memory("recv_file_list"); | |
957 | return NULL; /* not reached */ | |
958 | } | |
959 | ||
960 | ||
3ec4dd97 | 961 | int file_compare(struct file_struct **f1,struct file_struct **f2) |
c627d613 | 962 | { |
3ec4dd97 AT |
963 | if (!(*f1)->basename && !(*f2)->basename) return 0; |
964 | if (!(*f1)->basename) return -1; | |
965 | if (!(*f2)->basename) return 1; | |
966 | if ((*f1)->dirname == (*f2)->dirname) | |
aa9b77a5 AT |
967 | return u_strcmp((*f1)->basename, (*f2)->basename); |
968 | return u_strcmp(f_name(*f1),f_name(*f2)); | |
c627d613 AT |
969 | } |
970 | ||
971 | ||
972 | int flist_find(struct file_list *flist,struct file_struct *f) | |
973 | { | |
d966ee25 AT |
974 | int low=0,high=flist->count-1; |
975 | ||
976 | if (flist->count <= 0) return -1; | |
977 | ||
978 | while (low != high) { | |
979 | int mid = (low+high)/2; | |
3ec4dd97 | 980 | int ret = file_compare(&flist->files[flist_up(flist, mid)],&f); |
d966ee25 AT |
981 | if (ret == 0) return flist_up(flist, mid); |
982 | if (ret > 0) { | |
983 | high=mid; | |
984 | } else { | |
985 | low=mid+1; | |
986 | } | |
987 | } | |
988 | ||
3ec4dd97 | 989 | if (file_compare(&flist->files[flist_up(flist,low)],&f) == 0) |
d966ee25 AT |
990 | return flist_up(flist,low); |
991 | return -1; | |
c627d613 AT |
992 | } |
993 | ||
994 | ||
3ec4dd97 AT |
995 | /* |
996 | * free up one file | |
997 | */ | |
66203a98 | 998 | void free_file(struct file_struct *file) |
c627d613 | 999 | { |
3ec4dd97 AT |
1000 | if (!file) return; |
1001 | if (file->basename) free(file->basename); | |
1002 | if (file->link) free(file->link); | |
0b910560 | 1003 | if (file->sum) free(file->sum); |
3d382777 | 1004 | *file = null_file; |
3ec4dd97 | 1005 | } |
c627d613 | 1006 | |
c627d613 | 1007 | |
3d382777 AT |
1008 | /* |
1009 | * allocate a new file list | |
1010 | */ | |
1011 | struct file_list *flist_new() | |
1012 | { | |
1013 | struct file_list *flist; | |
1014 | ||
1015 | flist = (struct file_list *)malloc(sizeof(flist[0])); | |
1016 | if (!flist) out_of_memory("send_file_list"); | |
1017 | ||
1018 | flist->count=0; | |
1019 | flist->malloced = 1000; | |
1020 | flist->files = (struct file_struct **)malloc(sizeof(flist->files[0])* | |
1021 | flist->malloced); | |
1022 | if (!flist->files) out_of_memory("send_file_list"); | |
1023 | #if ARENA_SIZE > 0 | |
1024 | flist->string_area = string_area_new(0); | |
1025 | #else | |
5c66303a | 1026 | flist->string_area = NULL; |
3d382777 AT |
1027 | #endif |
1028 | return flist; | |
1029 | } | |
3ec4dd97 AT |
1030 | /* |
1031 | * free up all elements in a flist | |
1032 | */ | |
1033 | void flist_free(struct file_list *flist) | |
1034 | { | |
1035 | int i; | |
1036 | for (i=1;i<flist->count;i++) { | |
3d382777 AT |
1037 | if (!flist->string_area) |
1038 | free_file(flist->files[i]); | |
649d65ed | 1039 | free(flist->files[i]); |
3ec4dd97 | 1040 | } |
f5780433 | 1041 | memset((char *)flist->files, 0, sizeof(flist->files[0])*flist->count); |
3ec4dd97 | 1042 | free(flist->files); |
3d382777 AT |
1043 | if (flist->string_area) |
1044 | string_area_free(flist->string_area); | |
f5780433 | 1045 | memset((char *)flist, 0, sizeof(*flist)); |
3ec4dd97 | 1046 | free(flist); |
c627d613 AT |
1047 | } |
1048 | ||
1049 | ||
1050 | /* | |
1051 | * This routine ensures we don't have any duplicate names in our file list. | |
1052 | * duplicate names can cause corruption because of the pipelining | |
1053 | */ | |
0199b05f | 1054 | static void clean_flist(struct file_list *flist, int strip_root) |
c627d613 | 1055 | { |
3ec4dd97 | 1056 | int i; |
c627d613 | 1057 | |
3ec4dd97 AT |
1058 | if (!flist || flist->count == 0) |
1059 | return; | |
c627d613 | 1060 | |
3ec4dd97 AT |
1061 | qsort(flist->files,flist->count, |
1062 | sizeof(flist->files[0]), | |
1063 | (int (*)())file_compare); | |
1064 | ||
1065 | for (i=1;i<flist->count;i++) { | |
1066 | if (flist->files[i]->basename && | |
649d65ed | 1067 | flist->files[i-1]->basename && |
3ec4dd97 AT |
1068 | strcmp(f_name(flist->files[i]), |
1069 | f_name(flist->files[i-1])) == 0) { | |
1070 | if (verbose > 1 && !am_server) | |
9486289c | 1071 | rprintf(FINFO,"removing duplicate name %s from file list %d\n", |
3ec4dd97 | 1072 | f_name(flist->files[i-1]),i-1); |
3d382777 AT |
1073 | /* it's not great that the flist knows the semantics of the |
1074 | * file memory usage, but i'd rather not add a flag byte | |
1075 | * to that struct. XXX can i use a bit in the flags field? */ | |
1076 | if (flist->string_area) | |
1077 | flist->files[i][0] = null_file; | |
1078 | else | |
1079 | free_file(flist->files[i]); | |
3ec4dd97 AT |
1080 | } |
1081 | } | |
0199b05f AT |
1082 | |
1083 | if (strip_root) { | |
1084 | /* we need to strip off the root directory in the case | |
1085 | of relative paths, but this must be done _after_ | |
1086 | the sorting phase */ | |
1087 | for (i=0;i<flist->count;i++) { | |
1088 | if (flist->files[i]->dirname && | |
1089 | flist->files[i]->dirname[0] == '/') { | |
1090 | memmove(&flist->files[i]->dirname[0], | |
1091 | &flist->files[i]->dirname[1], | |
1092 | strlen(flist->files[i]->dirname)); | |
1093 | } | |
1094 | ||
1095 | if (flist->files[i]->dirname && | |
1096 | !flist->files[i]->dirname[0]) { | |
1097 | flist->files[i]->dirname = NULL; | |
1098 | } | |
1099 | } | |
1100 | } | |
1101 | ||
1102 | ||
1103 | if (verbose <= 3) return; | |
1104 | ||
1105 | for (i=0;i<flist->count;i++) { | |
5f808dfb | 1106 | rprintf(FINFO,"[%d] i=%d %s %s mode=0%o len=%.0f\n", |
08a740ff | 1107 | (int) getpid(), i, |
74e708d8 AT |
1108 | NS(flist->files[i]->dirname), |
1109 | NS(flist->files[i]->basename), | |
08a740ff | 1110 | (int) flist->files[i]->mode, |
5f808dfb | 1111 | (double)flist->files[i]->length); |
0199b05f | 1112 | } |
3ec4dd97 AT |
1113 | } |
1114 | ||
1115 | ||
1116 | /* | |
1117 | * return the full filename of a flist entry | |
1118 | */ | |
1119 | char *f_name(struct file_struct *f) | |
1120 | { | |
1121 | static char names[10][MAXPATHLEN]; | |
1122 | static int n; | |
1123 | char *p = names[n]; | |
1124 | ||
649d65ed | 1125 | if (!f || !f->basename) return NULL; |
3ec4dd97 AT |
1126 | |
1127 | n = (n+1)%10; | |
1128 | ||
1129 | if (f->dirname) { | |
37f9805d AT |
1130 | strlcpy(p, f->dirname, MAXPATHLEN); |
1131 | strlcat(p, "/", MAXPATHLEN); | |
1132 | strlcat(p, f->basename, MAXPATHLEN); | |
3ec4dd97 | 1133 | } else { |
37f9805d | 1134 | strlcpy(p, f->basename, MAXPATHLEN); |
3ec4dd97 AT |
1135 | } |
1136 | ||
1137 | return p; | |
c627d613 AT |
1138 | } |
1139 |