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
Switched prototype generation from awk to perl.
[rsync/rsync.git]
/
hlink.c
diff --git
a/hlink.c
b/hlink.c
index
3eac930
..
962261c
100644
(file)
--- a/
hlink.c
+++ b/
hlink.c
@@
-34,11
+34,9
@@
extern int protocol_version;
extern int remove_source_files;
extern int stdout_format_has_i;
extern int maybe_ATTRS_REPORT;
extern int remove_source_files;
extern int stdout_format_has_i;
extern int maybe_ATTRS_REPORT;
+extern int unsort_ndx;
extern char *basis_dir[];
extern struct file_list *cur_flist;
extern char *basis_dir[];
extern struct file_list *cur_flist;
-#ifdef ICONV_OPTION
-extern int ic_ndx;
-#endif
#ifdef SUPPORT_HARD_LINKS
#ifdef SUPPORT_HARD_LINKS
@@
-145,11
+143,9
@@
static void match_gnums(int32 *ndx_list, int ndx_count)
break;
F_HL_PREV(file) = prev;
/* The linked list must use raw ndx values. */
break;
F_HL_PREV(file) = prev;
/* The linked list must use raw ndx values. */
-#ifdef ICONV_OPTION
- if (ic_ndx)
+ if (unsort_ndx)
prev = F_NDX(file);
else
prev = F_NDX(file);
else
-#endif
prev = ndx_list[from] + hlink_flist->ndx_start;
}
if (prev < 0 && !inc_recurse) {
prev = ndx_list[from] + hlink_flist->ndx_start;
}
if (prev < 0 && !inc_recurse) {
@@
-163,11
+159,9
@@
static void match_gnums(int32 *ndx_list, int ndx_count)
file->flags |= FLAG_HLINK_LAST;
F_HL_PREV(file) = prev;
if (inc_recurse && CVAL(node->data, 0) == 0) {
file->flags |= FLAG_HLINK_LAST;
F_HL_PREV(file) = prev;
if (inc_recurse && CVAL(node->data, 0) == 0) {
-#ifdef ICONV_OPTION
- if (ic_ndx)
+ if (unsort_ndx)
prev = F_NDX(file);
else
prev = F_NDX(file);
else
-#endif
prev = ndx_list[from] + hlink_flist->ndx_start;
SIVAL(node->data, 1, prev);
}
prev = ndx_list[from] + hlink_flist->ndx_start;
SIVAL(node->data, 1, prev);
}
@@
-345,9
+339,9
@@
int hard_link_check(struct file_struct *file, int ndx, const char *fname,
|| prev_st.st_ino != alt_sx.st.st_ino)
continue;
statret = 1;
|| prev_st.st_ino != alt_sx.st.st_ino)
continue;
statret = 1;
- if (
verbose < 2 || !stdout_format_has_i) {
- if (stdout_format_has_i < 2)
-
itemizing = 0;
+ if (
stdout_format_has_i == 0
+ || (verbose < 2 && stdout_format_has_i < 2)) {
+ itemizing = 0;
code = FNONE;
if (verbose > 1 && maybe_ATTRS_REPORT)
rprintf(FCLIENT, "%s is uptodate\n", fname);
code = FNONE;
if (verbose > 1 && maybe_ATTRS_REPORT)
rprintf(FCLIENT, "%s is uptodate\n", fname);