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]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
22f688d
..
5044fb5
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-73,6
+73,7
@@
static char empty_sum[MD4_SUM_LENGTH];
static unsigned int min_file_struct_len;
static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
static unsigned int min_file_struct_len;
static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
+static void output_flist(struct file_list *flist);
void init_flist(void)
void init_flist(void)
@@
-1190,6
+1191,9
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
write_batch_flist_info(flist->count, flist->files);
}
write_batch_flist_info(flist->count, flist->files);
}
+ if (verbose > 3)
+ output_flist(flist);
+
if (verbose > 2)
rprintf(FINFO, "send_file_list done\n");
if (verbose > 2)
rprintf(FINFO, "send_file_list done\n");
@@
-1265,6
+1269,9
@@
struct file_list *recv_file_list(int f)
}
}
}
}
+ if (verbose > 3)
+ output_flist(flist);
+
if (list_only) {
int i;
for (i = 0; i < flist->count; i++)
if (list_only) {
int i;
for (i = 0; i < flist->count; i++)
@@
-1429,18
+1436,21
@@
static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
}
}
}
}
}
}
+}
- if (verbose <= 3)
- return;
+static void output_flist(struct file_list *flist)
+{
+ char uidbuf[16], gidbuf[16];
+ struct file_struct *file;
+ int i;
for (i = 0; i < flist->count; i++) {
for (i = 0; i < flist->count; i++) {
- char uidbuf[16], gidbuf[16];
- struct file_struct *file = flist->files[i];
+ file = flist->files[i];
if (am_root && preserve_uid)
sprintf(uidbuf, " uid=%ld", (long)file->uid);
else
*uidbuf = '\0';
if (am_root && preserve_uid)
sprintf(uidbuf, " uid=%ld", (long)file->uid);
else
*uidbuf = '\0';
- if (preserve_gid)
+ if (preserve_gid
&& file->gid != GID_NONE
)
sprintf(gidbuf, " gid=%ld", (long)file->gid);
else
*gidbuf = '\0';
sprintf(gidbuf, " gid=%ld", (long)file->gid);
else
*gidbuf = '\0';