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
The ndx arg passed to increment_active_files() is now the unique,
[rsync/rsync.git]
/
rsync.c
diff --git
a/rsync.c
b/rsync.c
index
a789ebd
..
f983135
100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-3,7
+3,7
@@
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2003, 2004, 2005, 2006
, 2007
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-45,13
+45,12
@@
extern int allow_8bit_chars;
extern int protocol_version;
extern int preserve_uid;
extern int preserve_gid;
extern int protocol_version;
extern int preserve_uid;
extern int preserve_gid;
-extern int inc
remental
;
+extern int inc
_recurse
;
extern int inplace;
extern int flist_eof;
extern int keep_dirlinks;
extern int make_backups;
extern mode_t orig_umask;
extern int inplace;
extern int flist_eof;
extern int keep_dirlinks;
extern int make_backups;
extern mode_t orig_umask;
-extern struct stats stats;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct chmod_mode_struct *daemon_chmod_modes;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct chmod_mode_struct *daemon_chmod_modes;
@@
-105,13
+104,13
@@
int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr,
read_loop:
while (1) {
read_loop:
while (1) {
- ndx = read_
int
(f_in);
+ ndx = read_
ndx
(f_in);
if (ndx >= 0)
break;
if (ndx == NDX_DONE)
return ndx;
if (ndx >= 0)
break;
if (ndx == NDX_DONE)
return ndx;
- if (!inc
remental
|| am_sender)
+ if (!inc
_recurse
|| am_sender)
goto invalid_ndx;
if (ndx == NDX_FLIST_EOF) {
flist_eof = 1;
goto invalid_ndx;
if (ndx == NDX_FLIST_EOF) {
flist_eof = 1;
@@
-408,7
+407,7
@@
struct file_list *flist_for_ndx(int ndx)
{
struct file_list *flist = cur_flist;
{
struct file_list *flist = cur_flist;
- if (!flist)
+ if (!flist
&& !(flist = first_flist)
)
return NULL;
while (ndx < flist->ndx_start) {
return NULL;
while (ndx < flist->ndx_start) {