X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8018edd3aa197b843bbed6e285ad99a1777989b3..dd7fb70f6eb6e46dbc9a76049fef568959713135:/flist.c

diff --git a/flist.c b/flist.c
index 9da5c73f..46079d96 100644
--- a/flist.c
+++ b/flist.c
@@ -107,9 +107,8 @@ static void finish_filelist_progress(const struct file_list *flist)
 		/* This overwrites the progress line */
 		rprintf(FINFO, "%d file%sto consider\n",
 			flist->count, flist->count == 1 ? " " : "s ");
-	} else {
+	} else
 		rprintf(FINFO, "done\n");
-	}
 }
 
 void show_flist_stats(void)
@@ -210,18 +209,15 @@ static void list_file_entry(struct file_struct *f)
  * @post @p buffer contains information about the link or the
  * referrent as appropriate, if they exist.
  **/
-int readlink_stat(const char *path, STRUCT_STAT * buffer, char *linkbuf)
+int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
 {
 #if SUPPORT_LINKS
-	if (copy_links) {
+	if (copy_links)
 		return do_stat(path, buffer);
-	}
-	if (do_lstat(path, buffer) == -1) {
+	if (do_lstat(path, buffer) == -1)
 		return -1;
-	}
 	if (S_ISLNK(buffer->st_mode)) {
-		int l;
-		l = readlink((char *) path, linkbuf, MAXPATHLEN - 1);
+		int l = readlink((char *) path, linkbuf, MAXPATHLEN - 1);
 		if (l == -1)
 			return -1;
 		linkbuf[l] = 0;
@@ -242,11 +238,9 @@ int readlink_stat(const char *path, STRUCT_STAT * buffer, char *linkbuf)
 int link_stat(const char *path, STRUCT_STAT * buffer)
 {
 #if SUPPORT_LINKS
-	if (copy_links) {
+	if (copy_links)
 		return do_stat(path, buffer);
-	} else {
-		return do_lstat(path, buffer);
-	}
+	return do_lstat(path, buffer);
 #else
 	return do_stat(path, buffer);
 #endif
@@ -301,17 +295,15 @@ static void set_filesystem(char *fname)
 
 static int to_wire_mode(mode_t mode)
 {
-	if (S_ISLNK(mode) && (_S_IFLNK != 0120000)) {
+	if (S_ISLNK(mode) && (_S_IFLNK != 0120000))
 		return (mode & ~(_S_IFMT)) | 0120000;
-	}
 	return (int) mode;
 }
 
 static mode_t from_wire_mode(int mode)
 {
-	if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000)) {
+	if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000))
 		return (mode & ~(_S_IFMT)) | _S_IFLNK;
-	}
 	return (mode_t) mode;
 }
 
@@ -360,16 +352,17 @@ static void flist_expand(struct file_list *flist)
 
 
 static void send_file_entry(struct file_struct *file, int f,
-			    unsigned base_flags)
+			    unsigned short base_flags)
 {
-	unsigned char flags;
-	static time_t last_time;
-	static mode_t last_mode;
-	static DEV64_T last_rdev;
-	static uid_t last_uid;
-	static gid_t last_gid;
+	unsigned short flags;
+	static time_t modtime;
+	static mode_t mode;
+	static DEV64_T rdev;	/* just high bytes after p28 */
+	static uid_t uid;
+	static gid_t gid;
+	static DEV64_T dev;
 	static char lastname[MAXPATHLEN];
-	char *fname, buf[MAXPATHLEN];
+	char *fname, fbuf[MAXPATHLEN];
 	int l1, l2;
 
 	if (f == -1)
@@ -382,20 +375,52 @@ static void send_file_entry(struct file_struct *file, int f,
 
 	io_write_phase = "send_file_entry";
 
-	fname = f_name_to(file, buf, sizeof buf);
+	fname = f_name_to(file, fbuf, sizeof fbuf);
 
 	flags = base_flags;
 
-	if (file->mode == last_mode)
+	if (file->mode == mode)
 		flags |= SAME_MODE;
-	if (file->rdev == last_rdev)
-		flags |= SAME_RDEV;
-	if (file->uid == last_uid)
+	else
+		mode = file->mode;
+	if (preserve_devices) {
+		if (protocol_version < 28) {
+			if (IS_DEVICE(mode) && file->rdev == rdev) {
+				/* Set both flags so that the test when
+				 * writing the data is simpler. */
+				flags |= SAME_RDEV_pre28|SAME_HIGH_RDEV;
+			}
+			else
+				rdev = file->rdev;
+		}
+		else if (IS_DEVICE(mode)) {
+			if ((file->rdev & ~0xFF) == rdev)
+				flags |= SAME_HIGH_RDEV;
+			else
+				rdev = file->rdev & ~0xFF;
+		}
+	}
+	if (file->uid == uid)
 		flags |= SAME_UID;
-	if (file->gid == last_gid)
+	else
+		uid = file->uid;
+	if (file->gid == gid)
 		flags |= SAME_GID;
-	if (file->modtime == last_time)
+	else
+		gid = file->gid;
+	if (file->modtime == modtime)
 		flags |= SAME_TIME;
+	else
+		modtime = file->modtime;
+	if (file->flags & HAS_INODE_DATA) {
+		if (file->dev == dev) {
+			if (protocol_version >= 28)
+				flags |= SAME_DEV;
+		}
+		else
+			dev = file->dev;
+		flags |= HAS_INODE_DATA;
+	}
 
 	for (l1 = 0;
 	     lastname[l1] && (fname[l1] == lastname[l1]) && (l1 < 255);
@@ -407,14 +432,22 @@ static void send_file_entry(struct file_struct *file, int f,
 	if (l2 > 255)
 		flags |= LONG_NAME;
 
-	/* we must make sure we don't send a zero flags byte or the other
-	   end will terminate the flist transfer */
-	if (flags == 0 && !S_ISDIR(file->mode))
-		flags |= FLAG_DELETE;
-	if (flags == 0)
-		flags |= LONG_NAME;
-
-	write_byte(f, flags);
+	/* We must make sure we don't send a zero flags byte or
+	 * the other end will terminate the flist transfer. */
+	if (flags == 0 && !S_ISDIR(mode))
+		flags |= FLAG_DELETE; /* NOTE: no meaning for non-dir */
+	if (protocol_version >= 28) {
+		if ((flags & 0xFF00) || flags == 0) {
+			flags |= EXTENDED_FLAGS;
+			write_byte(f, flags);
+			write_byte(f, flags >> 8);
+		} else
+			write_byte(f, flags);
+	} else {
+		if (flags == 0)
+			flags |= LONG_NAME;
+		write_byte(f, flags);
+	}
 	if (flags & SAME_NAME)
 		write_byte(f, l1);
 	if (flags & LONG_NAME)
@@ -425,56 +458,54 @@ static void send_file_entry(struct file_struct *file, int f,
 
 	write_longint(f, file->length);
 	if (!(flags & SAME_TIME))
-		write_int(f, (int) file->modtime);
+		write_int(f, modtime);
 	if (!(flags & SAME_MODE))
-		write_int(f, to_wire_mode(file->mode));
+		write_int(f, to_wire_mode(mode));
 	if (preserve_uid && !(flags & SAME_UID)) {
-		add_uid(file->uid);
-		write_int(f, (int) file->uid);
+		add_uid(uid);
+		write_int(f, uid);
 	}
 	if (preserve_gid && !(flags & SAME_GID)) {
-		add_gid(file->gid);
-		write_int(f, (int) file->gid);
+		add_gid(gid);
+		write_int(f, gid);
+	}
+	if (preserve_devices && IS_DEVICE(mode)) {
+		/* If SAME_HIGH_RDEV is off, SAME_RDEV_pre28 is also off. */
+		if (!(flags & SAME_HIGH_RDEV))
+			write_int(f, file->rdev);
+		else if (protocol_version >= 28)
+			write_byte(f, file->rdev);
 	}
-	if (preserve_devices && IS_DEVICE(file->mode)
-	    && !(flags & SAME_RDEV))
-		write_int(f, (int) file->rdev);
 
 #if SUPPORT_LINKS
-	if (preserve_links && S_ISLNK(file->mode)) {
+	if (preserve_links && S_ISLNK(mode)) {
 		write_int(f, strlen(file->link));
 		write_buf(f, file->link, strlen(file->link));
 	}
 #endif
 
 #if SUPPORT_HARD_LINKS
-	if (preserve_hard_links && S_ISREG(file->mode)) {
+	if (flags & HAS_INODE_DATA) {
 		if (protocol_version < 26) {
 			/* 32-bit dev_t and ino_t */
-			write_int(f, (int) file->dev);
-			write_int(f, (int) file->inode);
+			write_int(f, dev);
+			write_int(f, file->inode);
 		} else {
 			/* 64-bit dev_t and ino_t */
-			write_longint(f, file->dev);
+			if (!(flags & SAME_DEV))
+				write_longint(f, dev);
 			write_longint(f, file->inode);
 		}
 	}
 #endif
 
 	if (always_checksum) {
-		if (protocol_version < 21) {
+		if (protocol_version < 21)
 			write_buf(f, file->sum, 2);
-		} else {
+		else
 			write_buf(f, file->sum, MD4_SUM_LENGTH);
-		}
 	}
 
-	last_mode = file->mode;
-	last_rdev = file->rdev;
-	last_uid = file->uid;
-	last_gid = file->gid;
-	last_time = file->modtime;
-
 	strlcpy(lastname, fname, MAXPATHLEN);
 	lastname[MAXPATHLEN - 1] = 0;
 
@@ -484,13 +515,14 @@ static void send_file_entry(struct file_struct *file, int f,
 
 
 static void receive_file_entry(struct file_struct **fptr,
-			       unsigned flags, int f)
+			       unsigned short flags, int f)
 {
-	static time_t last_time;
-	static mode_t last_mode;
-	static DEV64_T last_rdev;
-	static uid_t last_uid;
-	static gid_t last_gid;
+	static time_t modtime;
+	static mode_t mode;
+	static DEV64_T rdev;	/* just high bytes after p28 */
+	static uid_t uid;
+	static gid_t gid;
+	static DEV64_T dev;
 	static char lastname[MAXPATHLEN];
 	char thisname[MAXPATHLEN];
 	unsigned int l1 = 0, l2 = 0;
@@ -534,9 +566,9 @@ static void receive_file_entry(struct file_struct **fptr,
 	if ((p = strrchr(thisname, '/'))) {
 		static char *lastdir;
 		*p = 0;
-		if (lastdir && strcmp(thisname, lastdir) == 0) {
+		if (lastdir && strcmp(thisname, lastdir) == 0)
 			file->dirname = lastdir;
-		} else {
+		else {
 			file->dirname = strdup(thisname);
 			lastdir = file->dirname;
 		}
@@ -549,24 +581,43 @@ static void receive_file_entry(struct file_struct **fptr,
 	if (!file->basename)
 		out_of_memory("receive_file_entry 1");
 
-
 	file->flags = flags;
 	file->length = read_longint(f);
-	file->modtime =
-	    (flags & SAME_TIME) ? last_time : (time_t) read_int(f);
-	file->mode =
-	    (flags & SAME_MODE) ? last_mode : from_wire_mode(read_int(f));
-	if (preserve_uid)
-		file->uid =
-		    (flags & SAME_UID) ? last_uid : (uid_t) read_int(f);
-	if (preserve_gid)
-		file->gid =
-		    (flags & SAME_GID) ? last_gid : (gid_t) read_int(f);
-	if (preserve_devices && IS_DEVICE(file->mode))
-		file->rdev =
-		    (flags & SAME_RDEV) ? last_rdev : (DEV64_T) read_int(f);
-
-	if (preserve_links && S_ISLNK(file->mode)) {
+	if (!(flags & SAME_TIME))
+		modtime = (time_t)read_int(f);
+	file->modtime = modtime;
+	if (!(flags & SAME_MODE))
+		mode = from_wire_mode(read_int(f));
+	file->mode = mode;
+
+	if (preserve_uid) {
+		if (!(flags & SAME_UID))
+			uid = (uid_t)read_int(f);
+		file->uid = uid;
+	}
+	if (preserve_gid) {
+		if (!(flags & SAME_GID))
+			gid = (gid_t)read_int(f);
+		file->gid = gid;
+	}
+	if (preserve_devices) {
+		if (protocol_version < 28) {
+			if (IS_DEVICE(mode)) {
+				if (!(flags & SAME_RDEV_pre28))
+					rdev = (DEV64_T)read_int(f);
+				file->rdev = rdev;
+			} else
+				rdev = 0;
+		} else if (IS_DEVICE(mode)) {
+			if (!(flags & SAME_HIGH_RDEV)) {
+				file->rdev = (DEV64_T)read_int(f);
+				rdev = file->rdev & ~0xFF;
+			} else
+				file->rdev = rdev | (DEV64_T)read_byte(f);
+		}
+	}
+
+	if (preserve_links && S_ISLNK(mode)) {
 		int l = read_int(f);
 		if (l < 0) {
 			rprintf(FERROR, "overflow: l=%d\n", l);
@@ -576,19 +627,23 @@ static void receive_file_entry(struct file_struct **fptr,
 		if (!file->link)
 			out_of_memory("receive_file_entry 2");
 		read_sbuf(f, file->link, l);
-		if (sanitize_paths) {
+		if (sanitize_paths)
 			sanitize_path(file->link, file->dirname);
-		}
 	}
 #if SUPPORT_HARD_LINKS
-	if (preserve_hard_links && S_ISREG(file->mode)) {
+	if (preserve_hard_links && protocol_version < 28
+	    && S_ISREG(mode))
+		file->flags |= HAS_INODE_DATA;
+	if (file->flags & HAS_INODE_DATA) {
 		if (protocol_version < 26) {
-			file->dev = read_int(f);
+			dev = read_int(f);
 			file->inode = read_int(f);
 		} else {
-			file->dev = read_longint(f);
+			if (!(flags & SAME_DEV))
+				dev = read_longint(f);
 			file->inode = read_longint(f);
 		}
+		file->dev = dev;
 	}
 #endif
 
@@ -596,19 +651,12 @@ static void receive_file_entry(struct file_struct **fptr,
 		file->sum = new_array(char, MD4_SUM_LENGTH);
 		if (!file->sum)
 			out_of_memory("md4 sum");
-		if (protocol_version < 21) {
+		if (protocol_version < 21)
 			read_buf(f, file->sum, 2);
-		} else {
+		else
 			read_buf(f, file->sum, MD4_SUM_LENGTH);
-		}
 	}
 
-	last_mode = file->mode;
-	last_rdev = file->rdev;
-	last_uid = file->uid;
-	last_gid = file->gid;
-	last_time = file->modtime;
-
 	if (!preserve_perms) {
 		extern int orig_umask;
 		/* set an appropriate set of permissions based on original
@@ -677,9 +725,8 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 	strlcpy(cleaned_name, fname, MAXPATHLEN);
 	cleaned_name[MAXPATHLEN - 1] = 0;
 	clean_fname(cleaned_name);
-	if (sanitize_paths) {
+	if (sanitize_paths)
 		sanitize_path(cleaned_name, NULL);
-	}
 	fname = cleaned_name;
 
 	memset(sum, 0, SUM_LENGTH);
@@ -734,9 +781,9 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 	if ((p = strrchr(fname, '/'))) {
 		static char *lastdir;
 		*p = 0;
-		if (lastdir && strcmp(fname, lastdir) == 0) {
+		if (lastdir && strcmp(fname, lastdir) == 0)
 			file->dirname = lastdir;
-		} else {
+		else {
 			file->dirname = strdup(fname);
 			lastdir = file->dirname;
 		}
@@ -752,16 +799,21 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 	file->mode = st.st_mode;
 	file->uid = st.st_uid;
 	file->gid = st.st_gid;
-	file->dev = st.st_dev;
-	file->inode = st.st_ino;
+	if (preserve_hard_links) {
+		if (protocol_version < 28? S_ISREG(st.st_mode)
+		    : !S_ISDIR(st.st_mode) && st.st_nlink > 1) {
+			file->dev = st.st_dev;
+			file->inode = st.st_ino;
+			file->flags |= HAS_INODE_DATA;
+		}
+	}
 #ifdef HAVE_STRUCT_STAT_ST_RDEV
 	file->rdev = st.st_rdev;
 #endif
 
 #if SUPPORT_LINKS
-	if (S_ISLNK(st.st_mode)) {
+	if (S_ISLNK(st.st_mode))
 		file->link = STRDUP(ap, linkbuf);
-	}
 #endif
 
 	if (always_checksum) {
@@ -780,15 +832,14 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 
 	if (flist_dir) {
 		static char *lastdir;
-		if (lastdir && strcmp(lastdir, flist_dir) == 0) {
+		if (lastdir && strcmp(lastdir, flist_dir) == 0)
 			file->basedir = lastdir;
-		} else {
+		else {
 			file->basedir = strdup(flist_dir);
 			lastdir = file->basedir;
 		}
-	} else {
+	} else
 		file->basedir = NULL;
-	}
 
 	if (!S_ISDIR(st.st_mode))
 		stats.total_size += st.st_size;
@@ -798,10 +849,10 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 
 
 void send_file_name(int f, struct file_list *flist, char *fname,
-		    int recursive, unsigned base_flags)
+		    int recursive, unsigned short base_flags)
 {
 	struct file_struct *file;
-	char buf[MAXPATHLEN];
+	char fbuf[MAXPATHLEN];
 	extern int delete_excluded;
 
 	/* f is set to -1 when calculating deletion file list */
@@ -817,7 +868,7 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 	flist_expand(flist);
 
 	if (write_batch)
-		file->flags = FLAG_DELETE;
+		file->flags |= FLAG_DELETE;
 
 	if (file->basename[0]) {
 		flist->files[flist->count++] = file;
@@ -827,7 +878,7 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 	if (S_ISDIR(file->mode) && recursive) {
 		struct exclude_struct **last_exclude_list =
 		    local_exclude_list;
-		send_directory(f, flist, f_name_to(file, buf, sizeof buf));
+		send_directory(f, flist, f_name_to(file, fbuf, sizeof fbuf));
 		local_exclude_list = last_exclude_list;
 		return;
 	}
@@ -924,7 +975,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	flist = flist_new();
 
 	if (f != -1) {
-		io_start_buffering(f);
+		io_start_buffering_out(f);
 		if (filesfrom_fd >= 0) {
 			if (argv[0] && !push_dir(argv[0], 0)) {
 				rprintf(FERROR, "push_dir %s failed: %s\n",
@@ -1054,21 +1105,18 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		}
 	}
 
-	if (f != -1) {
+	if (f != -1)
 		send_file_entry(NULL, f, 0);
-	}
 
-	if (show_filelist_p() && f != -1) {
+	if (show_filelist_p() && f != -1)
 		finish_filelist_progress(flist);
-	}
 
 	clean_flist(flist, 0, 0);
 
 	/* now send the uid/gid list. This was introduced in protocol
 	   version 15 */
-	if (f != -1) {
+	if (f != -1)
 		send_uid_list(f);
-	}
 
 	/* send the io_error flag */
 	if (f != -1) {
@@ -1094,7 +1142,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;
-	unsigned char flags;
+	unsigned short flags;
 	int64 start_read;
 	extern int list_only;
 
@@ -1114,11 +1162,13 @@ struct file_list *recv_file_list(int f)
 		goto oom;
 
 
-	for (flags = read_byte(f); flags; flags = read_byte(f)) {
+	while ((flags = read_byte(f)) != 0) {
 		int i = flist->count;
 
 		flist_expand(flist);
 
+		if (protocol_version >= 28 && (flags & EXTENDED_FLAGS))
+			flags |= read_byte(f) << 8;
 		receive_file_entry(&flist->files[i], flags, f);
 
 		if (S_ISREG(flist->files[i]->mode))
@@ -1140,31 +1190,27 @@ struct file_list *recv_file_list(int f)
 
 	clean_flist(flist, relative_paths, 1);
 
-	if (show_filelist_p()) {
+	if (show_filelist_p())
 		finish_filelist_progress(flist);
-	}
 
 	/* now recv the uid/gid list. This was introduced in protocol version 15 */
-	if (f != -1) {
+	if (f != -1)
 		recv_uid_list(f, flist);
-	}
 
 	/* recv the io_error flag */
 	if (f != -1 && !read_batch) {	/* dw-added readbatch */
 		extern int module_id;
 		extern int ignore_errors;
-		if (lp_ignore_errors(module_id) || ignore_errors) {
+		if (lp_ignore_errors(module_id) || ignore_errors)
 			read_int(f);
-		} else {
+		else
 			io_error |= read_int(f);
-		}
 	}
 
 	if (list_only) {
 		int i;
-		for (i = 0; i < flist->count; i++) {
+		for (i = 0; i < flist->count; i++)
 			list_file_entry(flist->files[i]);
-		}
 	}
 
 
@@ -1182,17 +1228,20 @@ struct file_list *recv_file_list(int f)
 }
 
 
-int file_compare(struct file_struct **f1, struct file_struct **f2)
+int file_compare(struct file_struct **file1, struct file_struct **file2)
 {
-	if (!(*f1)->basename && !(*f2)->basename)
+	struct file_struct *f1 = *file1;
+	struct file_struct *f2 = *file2;
+
+	if (!f1->basename && !f2->basename)
 		return 0;
-	if (!(*f1)->basename)
+	if (!f1->basename)
 		return -1;
-	if (!(*f2)->basename)
+	if (!f2->basename)
 		return 1;
-	if ((*f1)->dirname == (*f2)->dirname)
-		return u_strcmp((*f1)->basename, (*f2)->basename);
-	return f_name_cmp(*f1, *f2);
+	if (f1->dirname == f2->dirname)
+		return u_strcmp(f1->basename, f2->basename);
+	return f_name_cmp(f1, f2);
 }
 
 
@@ -1207,15 +1256,13 @@ int flist_find(struct file_list *flist, struct file_struct *f)
 
 	while (low != high) {
 		int mid = (low + high) / 2;
-		int ret =
-		    file_compare(&flist->files[flist_up(flist, mid)], &f);
+		int ret = file_compare(&flist->files[flist_up(flist, mid)],&f);
 		if (ret == 0)
 			return flist_up(flist, mid);
-		if (ret > 0) {
+		if (ret > 0)
 			high = mid;
-		} else {
+		else
 			low = mid + 1;
-		}
 	}
 
 	if (file_compare(&flist->files[flist_up(flist, low)], &f) == 0)
@@ -1359,8 +1406,8 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 		return;
 
 	for (i = 0; i < flist->count; i++) {
-		rprintf(FINFO, "[%d] i=%d %s %s mode=0%o len=%.0f\n",
-			(int) getpid(), i,
+		rprintf(FINFO, "[%ld] i=%d %s %s mode=0%o len=%.0f\n",
+			(long) getpid(), i,
 			NS(flist->files[i]->dirname),
 			NS(flist->files[i]->basename),
 			(int) flist->files[i]->mode,
@@ -1379,7 +1426,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 {
 	int dif;
 	const uchar *c1, *c2;
-	enum fnc_state state1 = fnc_DIR, state2 = fnc_DIR;
+	enum fnc_state state1, state2;
 
 	if (!f1 || !f1->basename) {
 		if (!f2 || !f2->basename)
@@ -1389,14 +1436,18 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 	if (!f2 || !f2->basename)
 		return 1;
 
-	if (!(c1 = f1->dirname)) {
+	if (!(c1 = (uchar*)f1->dirname)) {
 		state1 = fnc_BASE;
-		c1 = f1->basename;
+		c1 = (uchar*)f1->basename;
 	}
-	if (!(c2 = f2->dirname)) {
+	else
+		state1 = fnc_DIR;
+	if (!(c2 = (uchar*)f2->dirname)) {
 		state2 = fnc_BASE;
-		c2 = f2->basename;
+		c2 = (uchar*)f2->basename;
 	}
+	else
+		state2 = fnc_DIR;
 
 	while (1) {
 		if ((dif = (int)*c1 - (int)*c2) != 0)
@@ -1405,11 +1456,11 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 			switch (state1) {
 			case fnc_DIR:
 				state1 = fnc_SLASH;
-				c1 = "/";
+				c1 = (uchar*)"/";
 				break;
 			case fnc_SLASH:
 				state1 = fnc_BASE;
-				c1 = f1->basename;
+				c1 = (uchar*)f1->basename;
 				break;
 			case fnc_BASE:
 				break;
@@ -1419,11 +1470,11 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 			switch (state2) {
 			case fnc_DIR:
 				state2 = fnc_SLASH;
-				c2 = "/";
+				c2 = (uchar*)"/";
 				break;
 			case fnc_SLASH:
 				state2 = fnc_BASE;
-				c2 = f2->basename;
+				c2 = (uchar*)f2->basename;
 				break;
 			case fnc_BASE:
 				if (!*c1)
@@ -1440,18 +1491,18 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 /* Return a copy of the full filename of a flist entry, using the indicated
  * buffer.
  */
-char *f_name_to(struct file_struct *f, char *buf, int bsize)
+char *f_name_to(struct file_struct *f, char *fbuf, int bsize)
 {
 	if (!f || !f->basename)
 		return NULL;
 
 	if (f->dirname) {
-		int off = strlcpy(buf, f->dirname, bsize);
-		off += strlcpy(buf + off, "/", bsize - off);
-		strlcpy(buf + off, f->basename, bsize - off);
+		int off = strlcpy(fbuf, f->dirname, bsize);
+		off += strlcpy(fbuf + off, "/", bsize - off);
+		strlcpy(fbuf + off, f->basename, bsize - off);
 	} else
-		strlcpy(buf, f->basename, bsize);
-	return buf;
+		strlcpy(fbuf, f->basename, bsize);
+	return fbuf;
 }