Commit | Line | Data |
---|---|---|
241013b4 | 1 | From: Rusty Russell <rusty@rustcorp.com.au> |
241013b4 | 2 | Date: Wed, 03 Apr 2002 17:08:57 +1000 |
241013b4 | 3 | |
f74d2272 WD |
4 | Found old patch on google, and updated it for 2.5.4 (I know, but that's what |
5 | apt-get source gave me). | |
241013b4 MP |
6 | |
7 | Compiles, otherwise untested. | |
8 | Rusty. | |
f74d2272 WD |
9 | |
10 | [Updated for current CVS version by Wayne Davison. Passes *MOST* of the | |
11 | test suite, but otherwise UNTESTED.] | |
241013b4 MP |
12 | -- |
13 | Anyone who quotes me in their sig is an idiot. -- Rusty Russell. | |
14 | ||
fe6407b5 | 15 | --- Makefile.in 15 May 2004 00:48:11 -0000 1.101 |
7b675ff5 | 16 | +++ Makefile.in 21 May 2004 09:10:37 -0000 |
54691942 | 17 | @@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z |
241013b4 | 18 | zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \ |
f74d2272 WD |
19 | zlib/zutil.o zlib/adler32.o |
20 | OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \ | |
21 | - main.o checksum.o match.o syscall.o log.o backup.o | |
22 | + main.o checksum.o match.o syscall.o log.o backup.o alternate.o | |
23 | OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \ | |
24 | fileio.o batch.o clientname.o | |
25 | OBJS3=progress.o pipe.o | |
7b675ff5 WD |
26 | --- generator.c 18 May 2004 08:50:17 -0000 1.85 |
27 | +++ generator.c 21 May 2004 09:10:37 -0000 | |
ea238f1c | 28 | @@ -51,6 +51,7 @@ extern int list_only; |
54691942 WD |
29 | extern int only_existing; |
30 | extern int orig_umask; | |
31 | extern int safe_symlinks; | |
241013b4 MP |
32 | +extern int fuzzy; |
33 | ||
7b675ff5 | 34 | extern struct exclude_list_struct server_exclude_list; |
241013b4 | 35 | |
7b675ff5 | 36 | @@ -258,7 +259,61 @@ static void generate_and_send_sums(struc |
f74d2272 | 37 | } |
241013b4 MP |
38 | } |
39 | ||
40 | +/* Returns -1 for can't open (null file), -2 for skip */ | |
f74d2272 | 41 | +static int open_base_file(struct file_struct *file, char *fname, int statret, |
241013b4 MP |
42 | + STRUCT_STAT *st) |
43 | +{ | |
44 | + int fd = -1; | |
fe6407b5 | 45 | + |
241013b4 MP |
46 | + if (statret == 0) { |
47 | + if (S_ISREG(st->st_mode)) { | |
48 | + if (update_only | |
49 | + && cmp_modtime(st->st_mtime, file->modtime) > 0) { | |
50 | + if (verbose > 1) | |
f74d2272 | 51 | + rprintf(FINFO, "%s is newer\n", fname); |
241013b4 MP |
52 | + return -2; |
53 | + } | |
54 | + if (skip_file(fname, file, st)) { | |
7f2baf27 | 55 | + set_perms(fname, file, st, PERMS_REPORT); |
241013b4 MP |
56 | + return -2; |
57 | + } | |
58 | + fd = do_open(fname, O_RDONLY, 0); | |
59 | + if (fd == -1) { | |
fe6407b5 WD |
60 | + rsyserr(FERROR, errno, "failed to open %s, continuing", |
61 | + full_fname(fname)); | |
241013b4 | 62 | + return -1; |
f74d2272 WD |
63 | + } |
64 | + return fd; | |
241013b4 MP |
65 | + } else { |
66 | + /* Try to use symlink contents */ | |
67 | + if (S_ISLNK(st->st_mode)) { | |
68 | + fd = do_open_regular(fname); | |
69 | + /* Don't delete yet; receiver will need it */ | |
70 | + } else { | |
71 | + if (delete_file(fname) != 0) { | |
72 | + if (fd != -1) | |
73 | + close(fd); | |
74 | + return -2; | |
75 | + } | |
76 | + } | |
77 | + } | |
78 | + } | |
79 | + | |
80 | + if (fd == -1 && compare_dest != NULL) | |
81 | + fd = open_alternate_base_comparedir(fname); | |
7b675ff5 | 82 | + |
241013b4 MP |
83 | + if (fd == -1 && fuzzy) |
84 | + fd = open_alternate_base_fuzzy(fname); | |
85 | + | |
86 | + /* Update stat to understand size */ | |
87 | + if (fd != -1) { | |
f74d2272 | 88 | + if (do_fstat(fd, st) != 0) { |
fe6407b5 | 89 | + rsyserr(FERROR, errno, "fstat %s", full_fname(fname)); |
f74d2272 | 90 | + } |
241013b4 | 91 | + } |
7b675ff5 | 92 | |
241013b4 MP |
93 | + return fd; |
94 | +} | |
95 | ||
f74d2272 WD |
96 | /** |
97 | * Acts on file number @p i from @p flist, whose name is @p fname. | |
7b675ff5 | 98 | @@ -274,8 +329,6 @@ void recv_generator(char *fname, struct |
f74d2272 WD |
99 | STRUCT_STAT st; |
100 | struct map_struct *mapbuf; | |
241013b4 | 101 | int statret; |
241013b4 MP |
102 | - char *fnamecmp; |
103 | - char fnamecmpbuf[MAXPATHLEN]; | |
54691942 WD |
104 | |
105 | if (list_only) | |
106 | return; | |
7b675ff5 | 107 | @@ -413,107 +466,39 @@ void recv_generator(char *fname, struct |
241013b4 | 108 | } |
f74d2272 | 109 | #endif |
241013b4 | 110 | |
f74d2272 WD |
111 | - if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER)) |
112 | - return; | |
113 | - | |
114 | - if (!S_ISREG(file->mode)) { | |
115 | - rprintf(FINFO, "skipping non-regular file \"%s\"\n",fname); | |
116 | - return; | |
117 | - } | |
118 | - | |
241013b4 MP |
119 | - fnamecmp = fname; |
120 | - | |
f74d2272 | 121 | - if (statret == -1 && compare_dest != NULL) { |
241013b4 MP |
122 | - /* try the file at compare_dest instead */ |
123 | - int saveerrno = errno; | |
f74d2272 | 124 | - pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, compare_dest, fname); |
241013b4 MP |
125 | - statret = link_stat(fnamecmpbuf,&st); |
126 | - if (!S_ISREG(st.st_mode)) | |
127 | - statret = -1; | |
128 | - if (statret == -1) | |
129 | - errno = saveerrno; | |
f74d2272 WD |
130 | -#if HAVE_LINK |
131 | - else if (link_dest && !dry_run) { | |
132 | - if (do_link(fnamecmpbuf, fname) != 0) { | |
133 | - if (verbose > 0) { | |
fe6407b5 WD |
134 | - rsyserr(FINFO, errno, "link %s => %s", |
135 | - fnamecmpbuf, fname); | |
f74d2272 WD |
136 | - } |
137 | - } | |
138 | - fnamecmp = fnamecmpbuf; | |
139 | - } | |
140 | -#endif | |
241013b4 MP |
141 | - else |
142 | - fnamecmp = fnamecmpbuf; | |
143 | - } | |
144 | - | |
145 | - if (statret == -1) { | |
f74d2272 WD |
146 | - if (preserve_hard_links && hard_link_check(file, HL_SKIP)) |
147 | - return; | |
241013b4 MP |
148 | - if (errno == ENOENT) { |
149 | - write_int(f_out,i); | |
f74d2272 WD |
150 | - if (!dry_run) write_sum_head(f_out, NULL); |
151 | - } else if (verbose > 1) { | |
152 | + /* Failed to stat for some reason besides "not found". */ | |
153 | + if (statret == -1 && errno != ENOENT) { | |
fe6407b5 WD |
154 | + if (verbose > 1) { |
155 | rsyserr(FERROR, errno, | |
156 | - "recv_generator: failed to open %s", | |
157 | + "recv_generator failed to stat %s", | |
158 | full_fname(fname)); | |
159 | } | |
f74d2272 WD |
160 | return; |
161 | } | |
162 | ||
241013b4 MP |
163 | - if (!S_ISREG(st.st_mode)) { |
164 | - if (delete_file(fname) != 0) { | |
165 | - return; | |
166 | - } | |
167 | - | |
168 | - /* now pretend the file didn't exist */ | |
f74d2272 WD |
169 | - if (preserve_hard_links && hard_link_check(file, HL_SKIP)) |
170 | - return; | |
241013b4 | 171 | - write_int(f_out,i); |
f74d2272 | 172 | - if (!dry_run) write_sum_head(f_out, NULL); |
fe6407b5 | 173 | - return; |
241013b4 MP |
174 | - } |
175 | - | |
f74d2272 | 176 | - if (opt_ignore_existing && fnamecmp == fname) { |
241013b4 MP |
177 | - if (verbose > 1) |
178 | - rprintf(FINFO,"%s exists\n",fname); | |
7b675ff5 | 179 | - return; |
f74d2272 | 180 | - } |
7b675ff5 | 181 | - |
241013b4 | 182 | - if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) { |
f74d2272 | 183 | - if (verbose > 1) |
241013b4 | 184 | - rprintf(FINFO,"%s is newer\n",fname); |
f74d2272 | 185 | - return; |
7b675ff5 WD |
186 | - } |
187 | - | |
241013b4 MP |
188 | - if (skip_file(fname, file, &st)) { |
189 | - if (fnamecmp == fname) | |
7f2baf27 | 190 | - set_perms(fname, file, &st, PERMS_REPORT); |
241013b4 MP |
191 | - return; |
192 | - } | |
193 | - | |
194 | - if (dry_run) { | |
195 | - write_int(f_out,i); | |
7b675ff5 WD |
196 | + if ((fd = open_base_file(file, fname, statret, &st)) == -2) |
197 | return; | |
241013b4 | 198 | - } |
7b675ff5 | 199 | |
f74d2272 | 200 | - if (disable_deltas_p()) { |
241013b4 | 201 | - write_int(f_out,i); |
f74d2272 | 202 | - write_sum_head(f_out, NULL); |
241013b4 | 203 | - return; |
7b675ff5 WD |
204 | + if ((disable_deltas_p() || dry_run) && fd != -1) { |
205 | + close(fd); | |
206 | + fd = -1; | |
207 | } | |
208 | ||
f74d2272 | 209 | - /* open the file */ |
241013b4 | 210 | - fd = do_open(fnamecmp, O_RDONLY, 0); |
f74d2272 WD |
211 | - |
212 | if (fd == -1) { | |
fe6407b5 WD |
213 | - rsyserr(FERROR, errno, "failed to open %s, continuing", |
214 | - full_fname(fnamecmp)); | |
241013b4 | 215 | - /* pretend the file didn't exist */ |
241013b4 | 216 | + /* the file didn't exist, or we can pretend it doesn't */ |
f74d2272 WD |
217 | if (preserve_hard_links && hard_link_check(file, HL_SKIP)) |
218 | return; | |
219 | - write_int(f_out,i); | |
220 | - write_sum_head(f_out, NULL); | |
221 | + write_int(f_out, i); | |
241013b4 | 222 | + if (!dry_run) |
f74d2272 WD |
223 | + write_sum_head(f_out, NULL); |
224 | + return; | |
225 | + } | |
226 | + | |
227 | + if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER)) | |
228 | + return; | |
229 | + | |
230 | + if (!S_ISREG(file->mode)) { | |
231 | + rprintf(FINFO, "skipping non-regular file \"%s\"\n",fname); | |
241013b4 MP |
232 | return; |
233 | } | |
234 | ||
7b675ff5 | 235 | @@ -523,7 +508,7 @@ void recv_generator(char *fname, struct |
f74d2272 | 236 | mapbuf = NULL; |
241013b4 | 237 | |
f74d2272 WD |
238 | if (verbose > 3) { |
239 | - rprintf(FINFO,"gen mapped %s of size %.0f\n", fnamecmp, | |
240 | + rprintf(FINFO, "gen mapped %s of size %.0f\n", fname, | |
241 | (double)st.st_size); | |
242 | } | |
241013b4 | 243 | |
ea238f1c | 244 | --- options.c 6 May 2004 21:08:01 -0000 1.148 |
7b675ff5 | 245 | +++ options.c 21 May 2004 09:10:37 -0000 |
54691942 | 246 | @@ -91,6 +91,7 @@ int ignore_errors = 0; |
f74d2272 WD |
247 | int modify_window = 0; |
248 | int blocking_io = -1; | |
249 | int checksum_seed = 0; | |
250 | +int fuzzy = 0; | |
251 | unsigned int block_size = 0; | |
241013b4 | 252 | |
241013b4 | 253 | |
54691942 | 254 | @@ -290,6 +291,7 @@ void usage(enum logcode F) |
241013b4 MP |
255 | rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n"); |
256 | rprintf(F," --write-batch=PREFIX write batch fileset starting with PREFIX\n"); | |
257 | rprintf(F," --read-batch=PREFIX read batch fileset starting with PREFIX\n"); | |
f74d2272 | 258 | + rprintf(F," --fuzzy use similar file as basis if it does't exist\n"); |
241013b4 | 259 | #ifdef INET6 |
ea238f1c WD |
260 | rprintf(F," -4 --ipv4 prefer IPv4\n"); |
261 | rprintf(F," -6 --ipv6 prefer IPv6\n"); | |
54691942 | 262 | @@ -385,6 +387,7 @@ static struct poptOption long_options[] |
f74d2272 WD |
263 | {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 }, |
264 | {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0}, | |
265 | {"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 }, | |
266 | + {"fuzzy", 0, POPT_ARG_NONE, &fuzzy, 0, 0, 0 }, | |
267 | {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 }, | |
241013b4 | 268 | #ifdef INET6 |
ea238f1c | 269 | {"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 }, |
7b675ff5 | 270 | @@ -965,6 +968,9 @@ void server_options(char **args,int *arg |
f74d2272 | 271 | } |
241013b4 | 272 | } |
7b675ff5 | 273 | |
241013b4 MP |
274 | + if (fuzzy && am_sender) |
275 | + args[ac++] = "--fuzzy"; | |
7b675ff5 | 276 | + |
241013b4 | 277 | *argc = ac; |
f74d2272 | 278 | return; |
7b675ff5 WD |
279 | |
280 | --- receiver.c 21 May 2004 08:27:04 -0000 1.79 | |
281 | +++ receiver.c 21 May 2004 09:10:37 -0000 | |
282 | @@ -47,6 +47,7 @@ extern int ignore_errors; | |
54691942 | 283 | extern int orig_umask; |
7f2baf27 | 284 | extern int keep_partial; |
7b675ff5 | 285 | extern int checksum_seed; |
241013b4 MP |
286 | +extern int fuzzy; |
287 | ||
f74d2272 WD |
288 | static void delete_one(char *fn, int is_dir) |
289 | { | |
7b675ff5 | 290 | @@ -295,8 +296,6 @@ int recv_files(int f_in,struct file_list |
f74d2272 | 291 | char *fname, fbuf[MAXPATHLEN]; |
241013b4 MP |
292 | char template[MAXPATHLEN]; |
293 | char fnametmp[MAXPATHLEN]; | |
294 | - char *fnamecmp; | |
295 | - char fnamecmpbuf[MAXPATHLEN]; | |
f74d2272 | 296 | struct map_struct *mapbuf; |
241013b4 MP |
297 | int i; |
298 | struct file_struct *file; | |
7b675ff5 | 299 | @@ -359,35 +358,31 @@ int recv_files(int f_in,struct file_list |
241013b4 MP |
300 | if (verbose > 2) |
301 | rprintf(FINFO,"recv_files(%s)\n",fname); | |
302 | ||
303 | - fnamecmp = fname; | |
304 | - | |
f74d2272 | 305 | /* open the file */ |
241013b4 MP |
306 | - fd1 = do_open(fnamecmp, O_RDONLY, 0); |
307 | + fd1 = do_open(fname, O_RDONLY, 0); | |
308 | ||
f74d2272 | 309 | - if (fd1 == -1 && compare_dest != NULL) { |
241013b4 | 310 | - /* try the file at compare_dest instead */ |
f74d2272 WD |
311 | - pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, |
312 | - compare_dest, fname); | |
241013b4 MP |
313 | - fnamecmp = fnamecmpbuf; |
314 | - fd1 = do_open(fnamecmp, O_RDONLY, 0); | |
315 | - } | |
316 | + if (fd1 == -1 && compare_dest != NULL) | |
317 | + fd1 = open_alternate_base_comparedir(fname); | |
318 | + | |
319 | + if (fd1 == -1 && fuzzy) | |
320 | + fd1 = open_alternate_base_fuzzy(fname); | |
321 | ||
322 | if (fd1 != -1 && do_fstat(fd1,&st) != 0) { | |
fe6407b5 WD |
323 | rsyserr(FERROR, errno, "fstat %s failed", |
324 | - full_fname(fnamecmp)); | |
325 | + full_fname(fname)); | |
241013b4 MP |
326 | receive_data(f_in,NULL,-1,NULL,file->length); |
327 | close(fd1); | |
328 | continue; | |
329 | } | |
330 | ||
f74d2272 WD |
331 | - if (fd1 != -1 && S_ISDIR(st.st_mode) && fnamecmp == fname) { |
332 | + if (fd1 != -1 && S_ISDIR(st.st_mode)) { | |
333 | /* this special handling for directories | |
334 | * wouldn't be necessary if robust_rename() | |
335 | * and the underlying robust_unlink could cope | |
336 | * with directories | |
337 | */ | |
338 | rprintf(FERROR,"recv_files: %s is a directory\n", | |
339 | - full_fname(fnamecmp)); | |
340 | + full_fname(fname)); | |
341 | receive_data(f_in, NULL, -1, NULL, file->length); | |
241013b4 MP |
342 | close(fd1); |
343 | continue; | |
7b675ff5 | 344 | @@ -408,8 +403,10 @@ int recv_files(int f_in,struct file_list |
f74d2272 | 345 | |
241013b4 | 346 | if (fd1 != -1 && st.st_size > 0) { |
f74d2272 WD |
347 | mapbuf = map_file(fd1,st.st_size); |
348 | - if (verbose > 2) | |
241013b4 | 349 | - rprintf(FINFO,"recv mapped %s of size %.0f\n",fnamecmp,(double)st.st_size); |
f74d2272 WD |
350 | + if (verbose > 2) { |
351 | + rprintf(FINFO, "recv mapped %s of size %.0f\n", | |
352 | + fname, (double)st.st_size); | |
353 | + } | |
354 | } else | |
355 | mapbuf = NULL; | |
356 |