emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The logic to make cp -d or -P treat things like regular files should only

Browse Source 
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...
This commit is contained in:
Rob Landley 2006-06-24 21:27:36 +00:00
parent 5d9c42aadc
commit c983274565
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libbb/copy_file.c
View File

@ -8,17 +8,9 @@
* *
*/ */
#include <sys/types.h> #include "libbb.h"
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <utime.h> #include <utime.h>
#include <errno.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) int copy_file(const char *source, const char *dest, int flags)
{ {
@ -110,11 +102,12 @@ int copy_file(const char *source, const char *dest, int flags)
bb_perror_msg("unable to change permissions of `%s'", dest); bb_perror_msg("unable to change permissions of `%s'", dest);
status = -1; 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 src_fd;
int dst_fd; int dst_fd;
#ifdef CONFIG_FEATURE_PRESERVE_HARDLINKS if (ENABLE_FEATURE_PRESERVE_HARDLINKS) {
char *link_name; char *link_name;
if (!(flags & FILEUTILS_DEREFERENCE) && if (!(flags & FILEUTILS_DEREFERENCE) &&
@ -127,7 +120,7 @@ int copy_file(const char *source, const char *dest, int flags)
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); src_fd = open(source, O_RDONLY);
if (src_fd == -1) { if (src_fd == -1) {
bb_perror_msg("unable to open `%s'", source); bb_perror_msg("unable to open `%s'", source);