1 This patch adds the --detect-renamed option which makes rsync notice files
2 that either (1) match in size & modify-time (plus the basename, if possible)
3 or (2) match in size & checksum (when --checksum was also specified) and use
4 each match as an alternate basis file to speed up the transfer.
6 The algorithm attempts to scan the receiving-side's files in an efficient
7 manner. If --delete[-before] is enabled, we'll take advantage of the
8 pre-transfer delete pass to prepare any alternate-basis-file matches we
9 might find. If --delete-before is not enabled, rsync does the rename scan
10 during the regular file-sending scan (scanning each directory right before
11 the generator starts updating files from that dir). In this latter mode,
12 rsync might delay the updating of a file (if no alternate-basis match was
13 yet found) until the full scan of the receiving side is complete, at which
14 point any delayed files are processed.
16 I chose to hard-link the alternate-basis files into a ".~tmp~" subdir that
17 takes advantage of rsync's pre-existing partial-dir logic. This uses less
18 memory than trying to keep track of the matches internally, and also allows
19 any deletions or file-updates to occur normally without interfering with
20 these alternate-basis discoveries.
22 To use this patch, run these commands for a successful build:
24 patch -p1 <patches/detect-renamed.diff
25 ./configure (optional if already run)
30 We need to never return a match from fattr_find() that has a basis
31 file. This will ensure that we don't try to give a renamed file to
32 a file that can't use it, while missing out on giving it to a file
35 based-on: 25082d1ef6712a15c52a1dacb36b7f0642c23ac8
36 diff --git a/compat.c b/compat.c
39 @@ -42,6 +42,7 @@ extern int checksum_seed;
40 extern int basis_dir_cnt;
41 extern int prune_empty_dirs;
42 extern int protocol_version;
43 +extern int detect_renamed;
44 extern int protect_args;
45 extern int preserve_uid;
46 extern int preserve_gid;
47 @@ -122,6 +123,7 @@ void set_allow_inc_recurse(void)
48 allow_inc_recurse = 0;
50 && (delete_before || delete_after
52 || delay_updates || prune_empty_dirs))
53 allow_inc_recurse = 0;
54 else if (am_server && !local_server
55 diff --git a/delete.c b/delete.c
60 extern int make_backups;
61 extern int max_delete;
62 +extern int detect_renamed;
63 extern char *backup_dir;
64 extern char *backup_suffix;
65 extern int backup_suffix_len;
66 @@ -45,6 +46,8 @@ static inline int is_backup_file(char *fn)
67 * its contents, otherwise just checks for content. Returns DR_SUCCESS or
68 * DR_NOT_EMPTY. Note that fname must point to a MAXPATHLEN buffer! (The
69 * buffer is used for recursion, but returned unchanged.)
71 + * Note: --detect-rename may use this routine with DEL_NO_DELETIONS set!
73 static enum delret delete_dir_contents(char *fname, uint16 flags)
75 @@ -64,7 +67,9 @@ static enum delret delete_dir_contents(char *fname, uint16 flags)
76 save_filters = push_local_filters(fname, dlen);
78 non_perishable_cnt = 0;
79 + file_extra_cnt += SUM_EXTRA_CNT;
80 dirlist = get_dirlist(fname, dlen, 0);
81 + file_extra_cnt -= SUM_EXTRA_CNT;
82 ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
85 @@ -104,7 +109,8 @@ static enum delret delete_dir_contents(char *fname, uint16 flags)
86 if (S_ISDIR(fp->mode)) {
87 if (delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
90 + } else if (detect_renamed && S_ISREG(fp->mode))
91 + look_for_rename(fp, fname);
92 if (delete_item(fname, fp->mode, flags) != DR_SUCCESS)
95 @@ -127,6 +133,8 @@ static enum delret delete_dir_contents(char *fname, uint16 flags)
97 * Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's
98 * a directory! (The buffer is used for recursion, but returned unchanged.)
100 + * Also note: --detect-rename may use this routine with DEL_NO_DELETIONS set!
102 enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
104 diff --git a/flist.c b/flist.c
107 @@ -63,6 +63,7 @@ extern int non_perishable_cnt;
108 extern int prune_empty_dirs;
109 extern int copy_links;
110 extern int copy_unsafe_links;
111 +extern int detect_renamed;
112 extern int protocol_version;
113 extern int sanitize_paths;
114 extern int munge_symlinks;
115 @@ -134,6 +135,8 @@ static int64 tmp_dev, tmp_ino;
117 static char tmp_sum[MAX_DIGEST_LEN];
119 +struct file_list the_fattr_list;
121 static char empty_sum[MAX_DIGEST_LEN];
122 static int flist_count_offset; /* for --delete --progress */
124 @@ -301,6 +304,45 @@ static int is_excluded(const char *fname, int is_dir, int filter_level)
128 +static int fattr_compare(struct file_struct **file1, struct file_struct **file2)
130 + struct file_struct *f1 = *file1;
131 + struct file_struct *f2 = *file2;
132 + int64 len1 = F_LENGTH(f1), len2 = F_LENGTH(f2);
135 + if (!f1->basename || !S_ISREG(f1->mode) || !len1) {
136 + if (!f2->basename || !S_ISREG(f2->mode) || !len2)
140 + if (!f2->basename || !S_ISREG(f2->mode) || !len2)
143 + /* Don't use diff for values that are longer than an int. */
145 + return len1 < len2 ? -1 : 1;
147 + if (always_checksum) {
148 + diff = u_memcmp(F_SUM(f1), F_SUM(f2), checksum_len);
151 + } else if (f1->modtime != f2->modtime)
152 + return f1->modtime < f2->modtime ? -1 : 1;
154 + diff = u_strcmp(f1->basename, f2->basename);
158 + if (f1->dirname == f2->dirname)
164 + return u_strcmp(f1->dirname, f2->dirname);
167 static void send_directory(int f, struct file_list *flist,
168 char *fbuf, int len, int flags);
170 @@ -2550,6 +2592,25 @@ struct file_list *recv_file_list(int f)
172 flist_sort_and_clean(flist, relative_paths);
174 + if (detect_renamed) {
175 + int j = flist->used;
176 + the_fattr_list.used = j;
177 + the_fattr_list.files = new_array(struct file_struct *, j);
178 + if (!the_fattr_list.files)
179 + out_of_memory("recv_file_list");
180 + memcpy(the_fattr_list.files, flist->files,
181 + j * sizeof (struct file_struct *));
182 + qsort(the_fattr_list.files, j,
183 + sizeof the_fattr_list.files[0], (int (*)())fattr_compare);
184 + the_fattr_list.low = 0;
186 + struct file_struct *fp = the_fattr_list.files[j];
187 + if (fp->basename && S_ISREG(fp->mode) && F_LENGTH(fp))
190 + the_fattr_list.high = j;
193 if (protocol_version < 30) {
194 /* Recv the io_error flag */
195 int err = read_int(f);
196 diff --git a/generator.c b/generator.c
199 @@ -80,6 +80,7 @@ extern char *partial_dir;
200 extern int compare_dest;
201 extern int copy_dest;
202 extern int link_dest;
203 +extern int detect_renamed;
204 extern int whole_file;
205 extern int list_only;
206 extern int read_batch;
207 @@ -97,10 +98,12 @@ extern char *tmpdir;
208 extern char *basis_dir[MAX_BASIS_DIRS+1];
209 extern struct file_list *cur_flist, *first_flist, *dir_flist;
210 extern filter_rule_list filter_list, daemon_filter_list;
211 +extern struct file_list the_fattr_list;
213 int maybe_ATTRS_REPORT = 0;
215 static dev_t dev_zero;
216 +static int unexplored_dirs = 1;
217 static int deldelay_size = 0, deldelay_cnt = 0;
218 static char *deldelay_buf = NULL;
219 static int deldelay_fd = -1;
220 @@ -180,6 +183,8 @@ static int remember_delete(struct file_struct *file, const char *fname, int flag
221 if (!flush_delete_delay())
224 + if (flags & DEL_NO_DELETIONS)
229 @@ -271,13 +276,18 @@ static void do_delayed_deletions(char *delbuf)
230 * all the --delete-WHEN options. Note that the fbuf pointer must point to a
231 * MAXPATHLEN buffer with the name of the directory in it (the functions we
232 * call will append names onto the end, but the old dir value will be restored
234 -static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
237 + * Note: --detect-rename may use this routine with DEL_NO_DELETIONS set!
239 +static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev,
242 static int already_warned = 0;
243 struct file_list *dirlist;
244 - char delbuf[MAXPATHLEN];
246 + char *p, delbuf[MAXPATHLEN];
247 + unsigned remainder;
248 + int dlen, i, restore_dot = 0;
249 int save_uid_ndx = uid_ndx;
252 @@ -292,17 +302,22 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
253 maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH);
255 if (io_error && !ignore_errors) {
256 - if (already_warned)
257 + if (!already_warned) {
259 + "IO error encountered -- skipping file deletion\n");
260 + already_warned = 1;
262 + if (!detect_renamed)
265 - "IO error encountered -- skipping file deletion\n");
266 - already_warned = 1;
268 + del_flags |= DEL_NO_DELETIONS;
272 change_local_filter_dir(fbuf, dlen, F_DEPTH(file));
274 + if (detect_renamed)
277 if (one_file_system) {
278 if (file->flags & FLAG_TOP_DIR)
279 filesystem_dev = *fs_dev;
280 @@ -315,6 +330,14 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
282 dirlist = get_dirlist(fbuf, dlen, 0);
285 + if (dlen == 1 && *fbuf == '.') {
288 + } else if (dlen != 1 || *fbuf != '/')
290 + remainder = MAXPATHLEN - (p - fbuf);
292 /* If an item in dirlist is not found in flist, delete it
293 * from the filesystem. */
294 for (i = dirlist->used; i--; ) {
295 @@ -327,6 +350,10 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
299 + if (detect_renamed && S_ISREG(fp->mode)) {
300 + strlcpy(p, fp->basename, remainder);
301 + look_for_rename(fp, fbuf);
303 /* Here we want to match regardless of file type. Replacement
304 * of a file with one of another type is handled separately by
305 * a delete_item call with a DEL_MAKE_ROOM flag. */
306 @@ -335,14 +362,19 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
307 if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid)
308 flags |= DEL_NO_UID_WRITE;
310 - if (delete_during == 2) {
311 - if (!remember_delete(fp, delbuf, flags))
312 + if (delete_during == 2 && !(del_flags & DEL_NO_DELETIONS)) {
313 + if (!remember_delete(fp, delbuf, del_flags | flags))
316 - delete_item(delbuf, fp->mode, flags);
318 + delete_item(delbuf, fp->mode, del_flags | flags);
319 + } else if (detect_renamed && S_ISDIR(fp->mode))
330 @@ -380,14 +412,122 @@ static void do_delete_pass(void)
331 || !S_ISDIR(st.st_mode))
334 - delete_in_dir(fbuf, file, &st.st_dev);
335 + delete_in_dir(fbuf, file, &st.st_dev, 0);
337 - delete_in_dir(NULL, NULL, &dev_zero);
338 + delete_in_dir(NULL, NULL, &dev_zero, 0);
340 if (INFO_GTE(FLIST, 2) && !am_server)
341 rprintf(FINFO, " \r");
344 +/* Search for a regular file that matches either (1) the size & modified
345 + * time (plus the basename, if possible) or (2) the size & checksum. If
346 + * we find an exact match down to the dirname, return -1 because we found
347 + * an up-to-date file in the transfer, not a renamed file. */
348 +static int fattr_find(struct file_struct *f, char *fname)
350 + int low = the_fattr_list.low, high = the_fattr_list.high;
351 + int mid, ok_match = -1, good_match = -1;
352 + struct file_struct *fmid;
355 + while (low <= high) {
356 + mid = (low + high) / 2;
357 + fmid = the_fattr_list.files[mid];
358 + if (F_LENGTH(fmid) != F_LENGTH(f)) {
359 + if (F_LENGTH(fmid) < F_LENGTH(f))
365 + if (always_checksum) {
366 + /* We use the FLAG_FILE_SENT flag to indicate when we
367 + * have computed the checksum for an entry. */
368 + if (!(f->flags & FLAG_FILE_SENT)) {
369 + if (fmid->modtime == f->modtime
370 + && f_name_cmp(fmid, f) == 0)
371 + return -1; /* assume we can't help */
372 + file_checksum(fname, F_SUM(f), F_LENGTH(f));
373 + f->flags |= FLAG_FILE_SENT;
375 + diff = u_memcmp(F_SUM(fmid), F_SUM(f), checksum_len);
384 + if (fmid->modtime != f->modtime) {
385 + if (fmid->modtime < f->modtime)
393 + diff = u_strcmp(fmid->basename, f->basename);
396 + if (fmid->dirname == f->dirname)
397 + return -1; /* file is up-to-date */
398 + if (!fmid->dirname) {
406 + diff = u_strcmp(fmid->dirname, f->dirname);
408 + return -1; /* file is up-to-date */
416 + return good_match >= 0 ? good_match : ok_match;
419 +void look_for_rename(struct file_struct *file, char *fname)
421 + struct file_struct *fp;
422 + char *partialptr, *fn;
426 + if (!partial_dir || (ndx = fattr_find(file, fname)) < 0)
429 + fp = the_fattr_list.files[ndx];
430 + fn = f_name(fp, NULL);
431 + /* We don't provide an alternate-basis file if there is a basis file. */
432 + if (link_stat(fn, &st, 0) == 0)
436 + if ((partialptr = partial_dir_fname(fn)) == NULL
437 + || !handle_partial_dir(partialptr, PDIR_CREATE))
439 + /* We only use the file if we can hard-link it into our tmp dir. */
440 + if (link(fname, partialptr) != 0) {
441 + if (errno != EEXIST)
442 + handle_partial_dir(partialptr, PDIR_DELETE);
447 + /* I think this falls into the -vv category with "%s is uptodate", etc. */
448 + if (INFO_GTE(MISC, 2))
449 + rprintf(FINFO, "found renamed: %s => %s\n", fname, fn);
452 int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
454 #ifndef CAN_SET_SYMLINK_TIMES
455 @@ -1048,6 +1188,7 @@ static void list_file_entry(struct file_struct *f)
459 +static struct bitbag *delayed_bits = NULL;
460 static int phase = 0;
461 static int dflt_perms;
463 @@ -1327,9 +1468,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
465 else if (delete_during && f_out != -1 && !phase
466 && !(file->flags & FLAG_MISSING_DIR)) {
467 - if (file->flags & FLAG_CONTENT_DIR)
468 - delete_in_dir(fname, file, &real_sx.st.st_dev);
470 + if (file->flags & FLAG_CONTENT_DIR) {
471 + if (detect_renamed && real_ret != 0)
473 + delete_in_dir(fname, file, &real_sx.st.st_dev,
474 + delete_during < 0 ? DEL_NO_DELETIONS : 0);
476 change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
479 @@ -1590,8 +1734,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
483 - if (stat_errno == ENOENT)
484 + if (stat_errno == ENOENT) {
485 + if (detect_renamed && unexplored_dirs > 0
486 + && F_LENGTH(file)) {
487 + bitbag_set_bit(delayed_bits, ndx);
492 rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",
495 @@ -2058,6 +2208,12 @@ void generate_files(int f_out, const char *local_name)
496 if (DEBUG_GTE(GENR, 1))
497 rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
499 + if (detect_renamed) {
500 + delayed_bits = bitbag_create(cur_flist->used);
501 + if (!delete_before && !delete_during)
502 + delete_during = -1;
505 if (delete_before && !solo_file && cur_flist->used > 0)
507 if (delete_during == 2) {
508 @@ -2068,7 +2224,7 @@ void generate_files(int f_out, const char *local_name)
510 info_levels[INFO_FLIST] = info_levels[INFO_PROGRESS] = 0;
512 - if (append_mode > 0 || whole_file < 0)
513 + if (append_mode > 0 || detect_renamed || whole_file < 0)
515 if (DEBUG_GTE(FLIST, 1)) {
516 rprintf(FINFO, "delta-transmission %s\n",
517 @@ -2104,7 +2260,7 @@ void generate_files(int f_out, const char *local_name)
518 dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
520 dirdev = MAKEDEV(0, 0);
521 - delete_in_dir(fbuf, fp, &dirdev);
522 + delete_in_dir(fbuf, fp, &dirdev, 0);
524 change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
526 @@ -2151,7 +2307,21 @@ void generate_files(int f_out, const char *local_name)
527 } while ((cur_flist = cur_flist->next) != NULL);
530 - delete_in_dir(NULL, NULL, &dev_zero);
531 + delete_in_dir(NULL, NULL, &dev_zero, 0);
532 + if (detect_renamed) {
533 + if (delete_during < 0)
535 + detect_renamed = 0;
537 + for (i = -1; (i = bitbag_next_bit(delayed_bits, i)) >= 0; ) {
538 + struct file_struct *file = cur_flist->files[i];
540 + strlcpy(fbuf, local_name, sizeof fbuf);
542 + f_name(file, fbuf);
543 + recv_generator(fbuf, file, i, itemizing, code, f_out);
547 if (DEBUG_GTE(GENR, 1))
548 rprintf(FINFO, "generate_files phase=%d\n", phase);
549 diff --git a/options.c b/options.c
552 @@ -80,6 +80,7 @@ int am_server = 0;
554 int am_starting_up = 1;
555 int relative_paths = -1;
556 +int detect_renamed = 0;
557 int implied_dirs = 1;
558 int missing_args = 0; /* 0 = FERROR_XFER, 1 = ignore, 2 = delete */
560 @@ -743,6 +744,7 @@ void usage(enum logcode F)
561 rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n");
562 rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n");
563 rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n");
564 + rprintf(F," --detect-renamed try to find renamed files to speed up the transfer\n");
565 rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
566 rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n");
567 rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n");
568 @@ -938,6 +940,7 @@ static struct poptOption long_options[] = {
569 {"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
570 {"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
571 {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
572 + {"detect-renamed", 0, POPT_ARG_NONE, &detect_renamed, 0, 0, 0 },
573 {"fuzzy", 'y', POPT_ARG_VAL, &fuzzy_basis, 1, 0, 0 },
574 {"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
575 {"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
576 @@ -2157,7 +2160,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
580 - if (delay_updates && !partial_dir)
581 + if ((delay_updates || detect_renamed) && !partial_dir)
582 partial_dir = tmp_partialdir;
585 @@ -2166,6 +2169,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
586 snprintf(err_buf, sizeof err_buf,
587 "--%s cannot be used with --%s\n",
588 append_mode ? "append" : "inplace",
589 + detect_renamed ? "detect-renamed" :
590 delay_updates ? "delay-updates" : "partial-dir");
593 @@ -2528,6 +2532,8 @@ void server_options(char **args, int *argc_p)
594 args[ac++] = "--super";
596 args[ac++] = "--size-only";
597 + if (detect_renamed)
598 + args[ac++] = "--detect-renamed";
600 args[ac++] = "--stats";
602 diff --git a/rsync.h b/rsync.h
605 @@ -246,7 +246,7 @@ enum msgcode {
606 #define NDX_DEL_STATS -3
607 #define NDX_FLIST_OFFSET -101
609 -/* For calling delete_item() and delete_dir_contents(). */
610 +/* For calling delete_item(), delete_dir_contents(), and delete_in_dir(). */
611 #define DEL_NO_UID_WRITE (1<<0) /* file/dir has our uid w/o write perm */
612 #define DEL_RECURSE (1<<1) /* if dir, delete all contents */
613 #define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */
614 @@ -256,6 +256,7 @@ enum msgcode {
615 #define DEL_FOR_DEVICE (1<<6) /* making room for a replacement device */
616 #define DEL_FOR_SPECIAL (1<<7) /* making room for a replacement special */
617 #define DEL_FOR_BACKUP (1<<8) /* the delete is for a backup operation */
618 +#define DEL_NO_DELETIONS (1<<9) /* just check for renames w/o deleting */
620 #define DEL_MAKE_ROOM (DEL_FOR_FILE|DEL_FOR_DIR|DEL_FOR_SYMLINK|DEL_FOR_DEVICE|DEL_FOR_SPECIAL)
622 diff --git a/rsync.yo b/rsync.yo
625 @@ -397,6 +397,7 @@ to the detailed description below for a complete description. verb(
626 --modify-window=NUM compare mod-times with reduced accuracy
627 -T, --temp-dir=DIR create temporary files in directory DIR
628 -y, --fuzzy find similar file for basis if no dest file
629 + --detect-renamed try to find renamed files to speed the xfer
630 --compare-dest=DIR also compare received files relative to DIR
631 --copy-dest=DIR ... and include copies of unchanged files
632 --link-dest=DIR hardlink to files in DIR when unchanged
633 @@ -1670,6 +1671,21 @@ Note that the use of the bf(--delete) option might get rid of any potential
634 fuzzy-match files, so either use bf(--delete-after) or specify some
635 filename exclusions if you need to prevent this.
637 +dit(bf(--detect-renamed)) With this option, for each new source file
638 +(call it em(src/S)), rsync looks for a file em(dest/D) anywhere in the
639 +destination that passes the quick check with em(src/S). If such a em(dest/D)
640 +is found, rsync uses it as an alternate basis for transferring em(S). The
641 +idea is that if em(src/S) was renamed from em(src/D) (as opposed to em(src/S)
642 +passing the quick check with em(dest/D) by coincidence), the delta-transfer
643 +algorithm will find that all the data matches between em(src/S) and em(dest/D),
644 +and the transfer will be really fast.
646 +By default, alternate-basis files are hard-linked into a directory named
647 +".~tmp~" in each file's destination directory, but if you've specified
648 +the bf(--partial-dir) option, that directory will be used instead. These
649 +potential alternate-basis files will be removed as the transfer progresses.
650 +This option conflicts with bf(--inplace) and bf(--append).
652 dit(bf(--compare-dest=DIR)) This option instructs rsync to use em(DIR) on
653 the destination machine as an additional hierarchy to compare destination
654 files against doing transfers (if the files are missing in the destination
655 diff --git a/util.c b/util.c
658 @@ -1076,6 +1076,32 @@ char *normalize_path(char *path, BOOL force_newbuf, unsigned int *len_ptr)
662 +/* We need to supply our own strcmp function for file list comparisons
663 + * to ensure that signed/unsigned usage is consistent between machines. */
664 +int u_strcmp(const char *p1, const char *p2)
666 + for ( ; *p1; p1++, p2++) {
671 + return (int)*(uchar*)p1 - (int)*(uchar*)p2;
674 +/* We need a memcmp function compares unsigned-byte values. */
675 +int u_memcmp(const void *p1, const void *p2, size_t len)
677 + const uchar *u1 = p1;
678 + const uchar *u2 = p2;
682 + return (int)*u1 - (int)*u2;
689 * Return a quoted string with the full pathname of the indicated filename.
690 * The string " (in MODNAME)" may also be appended. The returned pointer