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
New support function: change_local_filter_dir().
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
11d4b04
..
a7eecc8
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-49,7
+49,7
@@
extern int preserve_uid;
extern int preserve_gid;
extern int relative_paths;
extern int implied_dirs;
extern int preserve_gid;
extern int relative_paths;
extern int implied_dirs;
-extern int f
list
_extra_cnt;
+extern int f
ile
_extra_cnt;
extern int ignore_perishable;
extern int non_perishable_cnt;
extern int prune_empty_dirs;
extern int ignore_perishable;
extern int non_perishable_cnt;
extern int prune_empty_dirs;
@@
-312,7
+312,6
@@
void flist_expand(struct file_list *flist)
static void send_file_entry(struct file_struct *file, int f, int ndx)
{
static void send_file_entry(struct file_struct *file, int f, int ndx)
{
- unsigned short flags;
static time_t modtime;
static mode_t mode;
static int64 dev;
static time_t modtime;
static mode_t mode;
static int64 dev;
@@
-324,6
+323,7
@@
static void send_file_entry(struct file_struct *file, int f, int ndx)
char fname[MAXPATHLEN];
int first_hlink_ndx = -1;
int l1, l2;
char fname[MAXPATHLEN];
int first_hlink_ndx = -1;
int l1, l2;
+ int flags;
f_name(file, fname);
f_name(file, fname);
@@
-499,7
+499,7
@@
static void send_file_entry(struct file_struct *file, int f, int ndx)
}
static struct file_struct *recv_file_entry(struct file_list *flist,
}
static struct file_struct *recv_file_entry(struct file_list *flist,
-
unsigned shor
t flags, int f)
+
in
t flags, int f)
{
static time_t modtime;
static mode_t mode;
{
static time_t modtime;
static mode_t mode;
@@
-515,7
+515,7
@@
static struct file_struct *recv_file_entry(struct file_list *flist,
char thisname[MAXPATHLEN];
unsigned int l1 = 0, l2 = 0;
int alloc_len, basename_len, dirname_len, linkname_len;
char thisname[MAXPATHLEN];
unsigned int l1 = 0, l2 = 0;
int alloc_len, basename_len, dirname_len, linkname_len;
- int extra_len = f
list
_extra_cnt * EXTRA_LEN;
+ int extra_len = f
ile
_extra_cnt * EXTRA_LEN;
int first_hlink_ndx = -1;
OFF_T file_length;
char *basename, *dirname, *bp;
int first_hlink_ndx = -1;
OFF_T file_length;
char *basename, *dirname, *bp;
@@
-827,7
+827,7
@@
struct file_struct *make_file(const char *fname, struct file_list *flist,
char thisname[MAXPATHLEN];
char linkname[MAXPATHLEN];
int alloc_len, basename_len, dirname_len, linkname_len;
char thisname[MAXPATHLEN];
char linkname[MAXPATHLEN];
int alloc_len, basename_len, dirname_len, linkname_len;
- int extra_len = f
list
_extra_cnt * EXTRA_LEN;
+ int extra_len = f
ile
_extra_cnt * EXTRA_LEN;
char *basename, *dirname, *bp;
if (!flist || !flist->count) /* Ignore lastdir when invalid. */
char *basename, *dirname, *bp;
if (!flist || !flist->count) /* Ignore lastdir when invalid. */
@@
-1055,7
+1055,7
@@
struct file_struct *make_file(const char *fname, struct file_list *flist,
/* Only called for temporary file_struct entries created by make_file(). */
void unmake_file(struct file_struct *file)
{
/* Only called for temporary file_struct entries created by make_file(). */
void unmake_file(struct file_struct *file)
{
- int extra_cnt = f
list
_extra_cnt + LEN64_BUMP(file);
+ int extra_cnt = f
ile
_extra_cnt + LEN64_BUMP(file);
#if EXTRA_ROUNDING > 0
if (extra_cnt & EXTRA_ROUNDING)
extra_cnt = (extra_cnt | EXTRA_ROUNDING) + 1;
#if EXTRA_ROUNDING > 0
if (extra_cnt & EXTRA_ROUNDING)
extra_cnt = (extra_cnt | EXTRA_ROUNDING) + 1;
@@
-1065,7
+1065,7
@@
void unmake_file(struct file_struct *file)
static struct file_struct *send_file_name(int f, struct file_list *flist,
char *fname, STRUCT_STAT *stp,
static struct file_struct *send_file_name(int f, struct file_list *flist,
char *fname, STRUCT_STAT *stp,
-
unsigned shor
t flags)
+
in
t flags)
{
struct file_struct *file;
{
struct file_struct *file;
@@
-1436,7
+1436,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
send_uid_list(f);
/* send the io_error flag */
send_uid_list(f);
/* send the io_error flag */
- write_int(f,
lp_ignore_errors(module_id)
? 0 : io_error);
+ write_int(f,
ignore_errors
? 0 : io_error);
io_end_buffering();
stats.flist_size = stats.total_written - start_write;
io_end_buffering();
stats.flist_size = stats.total_written - start_write;
@@
-1454,7
+1454,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
struct file_list *recv_file_list(int f)
{
struct file_list *flist;
struct file_list *recv_file_list(int f)
{
struct file_list *flist;
-
unsigned shor
t flags;
+
in
t flags;
int64 start_read;
rprintf(FLOG, "receiving file list\n");
int64 start_read;
rprintf(FLOG, "receiving file list\n");
@@
-1505,7
+1505,7
@@
struct file_list *recv_file_list(int f)
recv_uid_list(f, flist);
/* Recv the io_error flag */
recv_uid_list(f, flist);
/* Recv the io_error flag */
- if (
lp_ignore_errors(module_id) ||
ignore_errors)
+ if (ignore_errors)
read_int(f);
else
io_error |= read_int(f);
read_int(f);
else
io_error |= read_int(f);