[BusyBox-cvs] busybox/libbb copy_file.c,1.30,1.31

Erik Andersen andersen at busybox.net
Sun Feb 22 11:46:52 UTC 2004


Update of /var/cvs/busybox/libbb
In directory nail:/tmp/cvs-serv2944/libbb

Modified Files:
	copy_file.c 
Log Message:
For the time being, revert the changes for detecting copying
a directory into itself.  It is harder to do this correctly
than it appears.  Not trying at all seems a better compromise
for the time being, untill we can implement this correctly.


Index: copy_file.c
===================================================================
RCS file: /var/cvs/busybox/libbb/copy_file.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- a/copy_file.c	19 Feb 2004 01:52:29 -0000	1.30
+++ b/copy_file.c	22 Feb 2004 11:46:49 -0000	1.31
@@ -95,8 +95,6 @@
 			umask(saved_umask);
 		}
 
-		add_to_ino_dev_hashtable(&dest_stat, source);
-
 		/* Recursively copy files in SOURCE.  */
 		if ((dp = opendir(source)) == NULL) {
 			bb_perror_msg("unable to open directory `%s'", source);
@@ -110,10 +108,6 @@
 			new_source = concat_subpath_file(source, d->d_name);
 			if(new_source == NULL)
 				continue;
-			if (is_in_ino_dev_hashtable(&dest_stat, &new_source)) {
-				bb_error_msg("cannot copy a directory, `%s', into itself, `%s'", new_source, dest);
-				continue;
-			}
 			new_dest = concat_path_file(dest, d->d_name);
 			if (copy_file(new_source, new_dest, flags) < 0)
 				status = -1;




More information about the busybox-cvs mailing list