X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/97a67bdfa9050ee0a55fe37d42181b5524cbef10..fd4893155d5226d32f350d15cc3e29beec677f39:/flist.c

diff --git a/flist.c b/flist.c
index ace6484c..0906f39f 100644
--- a/flist.c
+++ b/flist.c
@@ -46,7 +46,6 @@ extern char *files_from;
 extern int filesfrom_fd;
 
 extern int one_file_system;
-extern int make_backups;
 extern int preserve_links;
 extern int preserve_hard_links;
 extern int preserve_perms;
@@ -661,8 +660,6 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 		flags |= XMIT_HAS_IDEV_DATA;
 	if (flags & XMIT_HAS_IDEV_DATA) {
 		INO64_T inode;
-		file->link_u.idev = pool_talloc(flist->hlink_pool,
-		    struct idev, 1, "inode_table");
 		if (protocol_version < 26) {
 			dev = read_int(f);
 			inode = read_int(f);
@@ -672,6 +669,8 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 			inode = read_longint(f);
 		}
 		if (flist->hlink_pool) {
+			file->link_u.idev = pool_talloc(flist->hlink_pool,
+			    struct idev, 1, "inode_table");
 			file->F_INODE = inode;
 			file->F_DEV = dev;
 		}
@@ -732,6 +731,8 @@ struct file_struct *make_file(char *fname,
 	char *basename, *dirname, *bp;
 	unsigned short flags = 0;
 
+	if (!flist)	/* lastdir isn't valid if flist is NULL */
+		lastdir_len = -1;
 
 	if (strlcpy(thisname, fname, sizeof thisname)
 	    >= sizeof thisname - flist_dir_len) {