mirror of
https://github.com/sheumann/hush.git
synced 2024-12-22 14:30:31 +00:00
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.
This commit is contained in:
parent
15a4f1ee50
commit
817565a0ff
@ -95,8 +95,6 @@ int copy_file(const char *source, const char *dest, int flags)
|
|||||||
umask(saved_umask);
|
umask(saved_umask);
|
||||||
}
|
}
|
||||||
|
|
||||||
add_to_ino_dev_hashtable(&dest_stat, source);
|
|
||||||
|
|
||||||
/* Recursively copy files in SOURCE. */
|
/* Recursively copy files in SOURCE. */
|
||||||
if ((dp = opendir(source)) == NULL) {
|
if ((dp = opendir(source)) == NULL) {
|
||||||
bb_perror_msg("unable to open directory `%s'", source);
|
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);
|
new_source = concat_subpath_file(source, d->d_name);
|
||||||
if(new_source == NULL)
|
if(new_source == NULL)
|
||||||
continue;
|
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);
|
new_dest = concat_path_file(dest, d->d_name);
|
||||||
if (copy_file(new_source, new_dest, flags) < 0)
|
if (copy_file(new_source, new_dest, flags) < 0)
|
||||||
status = -1;
|
status = -1;
|
||||||
|
Loading…
Reference in New Issue
Block a user