X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8c18ebe81d53ba65546feb5fff89ae574a361343..ba2133d6add082b059728074febdac6c520a4351:/rsync.c

diff --git a/rsync.c b/rsync.c
index 8e8e67ee..f103e3cd 100644
--- a/rsync.c
+++ b/rsync.c
@@ -3,12 +3,11 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2003-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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,7 +44,7 @@ extern int allow_8bit_chars;
 extern int protocol_version;
 extern int preserve_uid;
 extern int preserve_gid;
-extern int incremental;
+extern int inc_recurse;
 extern int inplace;
 extern int flist_eof;
 extern int keep_dirlinks;
@@ -110,7 +109,7 @@ int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr,
 			break;
 		if (ndx == NDX_DONE)
 			return ndx;
-		if (!incremental || am_sender)
+		if (!inc_recurse || am_sender)
 			goto invalid_ndx;
 		if (ndx == NDX_FLIST_EOF) {
 			flist_eof = 1;
@@ -407,7 +406,7 @@ struct file_list *flist_for_ndx(int ndx)
 {
 	struct file_list *flist = cur_flist;
 
-	if (!flist)
+	if (!flist && !(flist = first_flist))
 		return NULL;
 
 	while (ndx < flist->ndx_start) {