aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-06-24 21:27:36 +0000
committerRob Landley <rob@landley.net>2006-06-24 21:27:36 +0000
commitc983274565a3443177ba1a68aab23a61ae70d5ea (patch)
tree2b8f914ab92544031b385a2ced99df20577263b7
parent5d9c42aadc7a526faa58bc94b9bdb650595f9d24 (diff)
downloadbusybox-c983274565a3443177ba1a68aab23a61ae70d5ea.tar.gz
The logic to make cp -d or -P treat things like regular files should only
trigger for symlinks, not for device nodes. This should fix "cp -a /dev ." to work as expected (when run by root, anyway). While I was there, cleanup headers and make an #ifdef go away...
-rw-r--r--libbb/copy_file.c35
1 files changed, 14 insertions, 21 deletions
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index a4da92218..38a2cb9c3 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -8,17 +8,9 @@
*
*/
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
+#include "libbb.h"
#include <utime.h>
#include <errno.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "libbb.h"
int copy_file(const char *source, const char *dest, int flags)
{
@@ -110,24 +102,25 @@ int copy_file(const char *source, const char *dest, int flags)
bb_perror_msg("unable to change permissions of `%s'", dest);
status = -1;
}
- } else if (S_ISREG(source_stat.st_mode) || (flags & FILEUTILS_DEREFERENCE))
+ } else if (S_ISREG(source_stat.st_mode) ||
+ (S_ISLNK(source_stat.st_mode) && (flags & FILEUTILS_DEREFERENCE)))
{
int src_fd;
int dst_fd;
-#ifdef CONFIG_FEATURE_PRESERVE_HARDLINKS
- char *link_name;
+ if (ENABLE_FEATURE_PRESERVE_HARDLINKS) {
+ char *link_name;
- if (!(flags & FILEUTILS_DEREFERENCE) &&
- is_in_ino_dev_hashtable(&source_stat, &link_name)) {
- if (link(link_name, dest) < 0) {
- bb_perror_msg("unable to link `%s'", dest);
- return -1;
- }
+ if (!(flags & FILEUTILS_DEREFERENCE) &&
+ is_in_ino_dev_hashtable(&source_stat, &link_name)) {
+ if (link(link_name, dest) < 0) {
+ bb_perror_msg("unable to link `%s'", dest);
+ return -1;
+ }
- return 0;
+ return 0;
+ }
+ add_to_ino_dev_hashtable(&source_stat, dest);
}
- add_to_ino_dev_hashtable(&source_stat, dest);
-#endif
src_fd = open(source, O_RDONLY);
if (src_fd == -1) {
bb_perror_msg("unable to open `%s'", source);