aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2004-02-22 11:46:49 +0000
committerEric Andersen <andersen@codepoet.org>2004-02-22 11:46:49 +0000
commit817565a0ffe4051cf1ba5c0ae0a779dcf0ac00cf (patch)
treeea499d6fc9d947874e1613370ba7ff37f7a86baf
parent15a4f1ee50f61cecd84cc95c38e1185faa81c03c (diff)
downloadbusybox-w32-817565a0ffe4051cf1ba5c0ae0a779dcf0ac00cf.tar.gz
busybox-w32-817565a0ffe4051cf1ba5c0ae0a779dcf0ac00cf.tar.bz2
busybox-w32-817565a0ffe4051cf1ba5c0ae0a779dcf0ac00cf.zip
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.
-rw-r--r--libbb/copy_file.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index 7a13e9968..7ddb9a23f 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -95,8 +95,6 @@ int copy_file(const char *source, const char *dest, int flags)
95 umask(saved_umask); 95 umask(saved_umask);
96 } 96 }
97 97
98 add_to_ino_dev_hashtable(&dest_stat, source);
99
100 /* Recursively copy files in SOURCE. */ 98 /* Recursively copy files in SOURCE. */
101 if ((dp = opendir(source)) == NULL) { 99 if ((dp = opendir(source)) == NULL) {
102 bb_perror_msg("unable to open directory `%s'", source); 100 bb_perror_msg("unable to open directory `%s'", source);
@@ -110,10 +108,6 @@ int copy_file(const char *source, const char *dest, int flags)
110 new_source = concat_subpath_file(source, d->d_name); 108 new_source = concat_subpath_file(source, d->d_name);
111 if(new_source == NULL) 109 if(new_source == NULL)
112 continue; 110 continue;
113 if (is_in_ino_dev_hashtable(&dest_stat, &new_source)) {
114 bb_error_msg("cannot copy a directory, `%s', into itself, `%s'", new_source, dest);
115 continue;
116 }
117 new_dest = concat_path_file(dest, d->d_name); 111 new_dest = concat_path_file(dest, d->d_name);
118 if (copy_file(new_source, new_dest, flags) < 0) 112 if (copy_file(new_source, new_dest, flags) < 0)
119 status = -1; 113 status = -1;