Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved a function.
[rsync/rsync.git]
/
backup.c
diff --git
a/backup.c
b/backup.c
index
3f5c416
..
c1b8083
100644
(file)
--- a/
backup.c
+++ b/
backup.c
@@
-25,6
+25,7
@@
extern int backup_suffix_len;
extern int backup_dir_len;
extern char *backup_suffix;
extern char *backup_dir;
extern int backup_dir_len;
extern char *backup_suffix;
extern char *backup_dir;
+extern struct file_struct **hlink_list;
extern int am_root;
extern int preserve_devices;
extern int am_root;
extern int preserve_devices;
@@
-198,7
+199,7
@@
static int keep_backup(char *fname)
if (do_stat(fname, &st)) return 1;
#endif
if (do_stat(fname, &st)) return 1;
#endif
- file = make_file(fname, N
ULL, N
O_EXCLUDES);
+ file = make_file(fname, NO_EXCLUDES);
/* the file could have disappeared */
if (!file) return 1;
/* the file could have disappeared */
if (!file) return 1;
@@
-263,7
+264,7
@@
static int keep_backup(char *fname)
}
#endif
if (!kept && preserve_hard_links && file->link_u.links
}
#endif
if (!kept && preserve_hard_links && file->link_u.links
- &&
file->F_HEAD
!= file) {
+ &&
hlink_list[file->F_HLINDEX]
!= file) {
if (verbose > 1)
rprintf(FINFO, "%s is a hard link\n", f_name(file));
}
if (verbose > 1)
rprintf(FINFO, "%s is a hard link\n", f_name(file));
}
@@
-281,8
+282,7
@@
static int keep_backup(char *fname)
}
}
set_perms(keep_name, file, NULL, 0);
}
}
set_perms(keep_name, file, NULL, 0);
- free_file(file);
- free(file);
+ free_file(file, FREE_STRUCT);
if (verbose > 1)
rprintf(FINFO, "keep_backup %s -> %s\n", fname, keep_name);
if (verbose > 1)
rprintf(FINFO, "keep_backup %s -> %s\n", fname, keep_name);