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
Got rid of the erroneous --dry-run short-circuit in the directory
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
25f5cf3
..
0e787eb
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-76,7
+76,7
@@
static unsigned int file_struct_len;
static struct file_list *received_flist;
static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
static struct file_list *received_flist;
static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
-static void output_flist(struct file_list *flist);
+static void output_flist(struct file_list *flist
, const char *whose_list
);
void init_flist(void)
{
void init_flist(void)
{
@@
-335,7
+335,7
@@
void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
unsigned short flags;
static time_t modtime;
static mode_t mode;
unsigned short flags;
static time_t modtime;
static mode_t mode;
- static
u
int64 dev;
+ static int64 dev;
static dev_t rdev;
static uint32 rdev_major;
static uid_t uid;
static dev_t rdev;
static uint32 rdev_major;
static uid_t uid;
@@
-527,7
+527,7
@@
void receive_file_entry(struct file_struct **fptr, unsigned short flags,
{
static time_t modtime;
static mode_t mode;
{
static time_t modtime;
static mode_t mode;
- static
u
int64 dev;
+ static int64 dev;
static dev_t rdev;
static uint32 rdev_major;
static uid_t uid;
static dev_t rdev;
static uint32 rdev_major;
static uid_t uid;
@@
-684,7
+684,7
@@
void receive_file_entry(struct file_struct **fptr, unsigned short flags,
if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
flags |= XMIT_HAS_IDEV_DATA;
if (flags & XMIT_HAS_IDEV_DATA) {
if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
flags |= XMIT_HAS_IDEV_DATA;
if (flags & XMIT_HAS_IDEV_DATA) {
-
u
int64 inode;
+ int64 inode;
if (protocol_version < 26) {
dev = read_int(f);
inode = read_int(f);
if (protocol_version < 26) {
dev = read_int(f);
inode = read_int(f);
@@
-1253,7
+1253,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
}
if (verbose > 3)
}
if (verbose > 3)
- output_flist(flist);
+ output_flist(flist
, f < 0 ? "delete" : who_am_i()
);
if (verbose > 2)
rprintf(FINFO, "send_file_list done\n");
if (verbose > 2)
rprintf(FINFO, "send_file_list done\n");
@@
-1327,7
+1327,7
@@
struct file_list *recv_file_list(int f)
}
if (verbose > 3)
}
if (verbose > 3)
- output_flist(flist);
+ output_flist(flist
, who_am_i()
);
if (list_only) {
int i;
if (list_only) {
int i;
@@
-1503,7
+1503,7
@@
static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
}
}
}
}
-static void output_flist(struct file_list *flist)
+static void output_flist(struct file_list *flist
, const char *whose_list
)
{
char uidbuf[16], gidbuf[16];
struct file_struct *file;
{
char uidbuf[16], gidbuf[16];
struct file_struct *file;
@@
-1520,7
+1520,7
@@
static void output_flist(struct file_list *flist)
else
*gidbuf = '\0';
rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f%s%s\n",
else
*gidbuf = '\0';
rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f%s%s\n",
- who
_am_i()
, i, NS(file->basedir), NS(file->dirname),
+ who
se_list
, i, NS(file->basedir), NS(file->dirname),
NS(file->basename), (int)file->mode,
(double)file->length, uidbuf, gidbuf);
}
NS(file->basename), (int)file->mode,
(double)file->length, uidbuf, gidbuf);
}