Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f3d6d48
)
A few minor tweaks to handle the newest variable names.
author
Wayne Davison
<wayned@samba.org>
Thu, 28 Dec 2006 07:54:34 +0000
(07:54 +0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 28 Dec 2006 07:54:34 +0000
(07:54 +0000)
hlink.c
patch
|
blob
|
blame
|
history
diff --git
a/hlink.c
b/hlink.c
index
9919e92
..
28a1c74
100644
(file)
--- a/
hlink.c
+++ b/
hlink.c
@@
-33,12
+33,12
@@
extern int remove_source_files;
extern int stdout_format_has_i;
extern int maybe_ATTRS_REPORT;
extern char *basis_dir[];
extern int stdout_format_has_i;
extern int maybe_ATTRS_REPORT;
extern char *basis_dir[];
-extern struct file_list *
the_file_
list;
+extern struct file_list *
cur_f
list;
#ifdef SUPPORT_HARD_LINKS
#define HASH_LOAD_LIMIT(size) ((size)*3/4)
#ifdef SUPPORT_HARD_LINKS
#define HASH_LOAD_LIMIT(size) ((size)*3/4)
-#define FPTR(i) (
the_file_
list->files[i])
+#define FPTR(i) (
cur_f
list->files[i])
struct ihash_table {
int32 size;
struct ihash_table {
int32 size;
@@
-251,10
+251,10
@@
void match_hard_links(void)
int i, ndx_count = 0;
int32 *ndx_list;
int i, ndx_count = 0;
int32 *ndx_list;
- if (!(ndx_list = new_array(int32,
the_file_
list->count)))
+ if (!(ndx_list = new_array(int32,
cur_f
list->count)))
out_of_memory("match_hard_links");
out_of_memory("match_hard_links");
- for (i = 0; i <
the_file_
list->count; i++) {
+ for (i = 0; i <
cur_f
list->count; i++) {
if (F_IS_HLINKED(FPTR(i)))
ndx_list[ndx_count++] = i;
}
if (F_IS_HLINKED(FPTR(i)))
ndx_list[ndx_count++] = i;
}
@@
-285,7
+285,7
@@
static int maybe_hard_link(struct file_struct *file, int ndx,
file->flags |= FLAG_HLINK_DONE;
return 0;
}
file->flags |= FLAG_HLINK_DONE;
return 0;
}
- if (make_backups) {
+ if (make_backups
> 0
) {
if (!make_backup(fname))
return -1;
} else if (robust_unlink(fname)) {
if (!make_backup(fname))
return -1;
} else if (robust_unlink(fname)) {
@@
-322,13
+322,13
@@
int hard_link_check(struct file_struct *file, int ndx, const char *fname,
/* Is the previous link is not complete yet? */
if (!(prev_file->flags & FLAG_HLINK_DONE)) {
/* Is the previous link being transferred? */
/* Is the previous link is not complete yet? */
if (!(prev_file->flags & FLAG_HLINK_DONE)) {
/* Is the previous link being transferred? */
- if (prev_file->flags & FLAG_SENT) {
+ if (prev_file->flags & FLAG_
FILE_
SENT) {
/* Add ourselves to the list of files that will be
* updated when the transfer completes, and mark
* ourself as waiting for the transfer. */
F_HL_PREV(file) = F_HL_PREV(prev_file);
F_HL_PREV(prev_file) = ndx;
/* Add ourselves to the list of files that will be
* updated when the transfer completes, and mark
* ourself as waiting for the transfer. */
F_HL_PREV(file) = F_HL_PREV(prev_file);
F_HL_PREV(prev_file) = ndx;
- file->flags |= FLAG_SENT;
+ file->flags |= FLAG_
FILE_
SENT;
return 1;
}
return 0;
return 1;
}
return 0;