For the time being, revert the changes for detecting copying
authorEric Andersen <andersen@codepoet.org>
Sun, 22 Feb 2004 11:46:49 +0000 (11:46 -0000)
committerEric Andersen <andersen@codepoet.org>
Sun, 22 Feb 2004 11:46:49 +0000 (11:46 -0000)
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.

libbb/copy_file.c

index 7a13e996822604a9acc6101f01b54dcd4f1207d3..7ddb9a23fb745ad358bc8562c372246fd0b6bf95 100644 (file)
@@ -95,8 +95,6 @@ int copy_file(const char *source, const char *dest, int flags)
                        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 @@ int copy_file(const char *source, const char *dest, int flags)
                        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;