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

cp: fix "cp -RL" to create regular files even if src is a symlink

Browse Source
This commit is contained in:
Denis Vlasenko 2008-04-27 22:06:24 +00:00
parent 4809a9f78e
commit c0431ed455
4 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applets/install.sh
View File

@ -37,7 +37,7 @@ if [ -n "$DO_INSTALL_LIBS" ] && [ "$DO_INSTALL_LIBS" != "n" ]; then
for i in $DO_INSTALL_LIBS; do for i in $DO_INSTALL_LIBS; do
rm -f $prefix/$libdir/$i || exit 1 rm -f $prefix/$libdir/$i || exit 1
if [ -f $i ]; then if [ -f $i ]; then
cp -a $i $prefix/$libdir/ || exit 1 cp -pPR $i $prefix/$libdir/ || exit 1
chmod 0644 $prefix/$libdir/$i || exit 1 chmod 0644 $prefix/$libdir/$i || exit 1
fi fi
done done

22
coreutils/cp.c
View File

@ -37,25 +37,27 @@ int cp_main(int argc, char **argv)
OPT_r = 1 << (sizeof(FILEUTILS_CP_OPTSTR)), OPT_r = 1 << (sizeof(FILEUTILS_CP_OPTSTR)),
OPT_P = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+1), OPT_P = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+1),
OPT_H = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+2), OPT_H = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+2),
OPT_L = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+3),
}; };
// Need at least two arguments // Need at least two arguments
// Soft- and hardlinking don't mix // Soft- and hardlinking doesn't mix
// -P and -d are the same (-P is POSIX, -d is GNU) // -P and -d are the same (-P is POSIX, -d is GNU)
// -r and -R are the same // -r and -R are the same
// -R (and therefore -r) turns on -d (coreutils does this) // -R (and therefore -r) turns on -d (coreutils does this)
// -a = -pdR // -a = -pdR
opt_complementary = "-2:l--s:s--l:Pd:rRd:Rd:apdR"; opt_complementary = "-2:l--s:s--l:Pd:rRd:Rd:apdR:HL";
flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPHL"); flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPH");
argc -= optind; argc -= optind;
argv += optind; argv += optind;
flags ^= FILEUTILS_DEREFERENCE; /* The sense of this flag was reversed. */ flags ^= FILEUTILS_DEREFERENCE; /* the sense of this flag was reversed */
/* Default behavior of cp is to dereference, so we don't have to do /* coreutils 6.9 compat:
* anything special when we are given -L. * by default, "cp" derefs symlinks (creates regular dest files),
* The behavior of -H is *almost* like -L, but not quite, so let's * but "cp -R" does not. We switch off deref if -r or -R (see above).
* just ignore it too for fun. * However, "cp -RL" must still deref symlinks: */
if (flags & OPT_L) ... if (flags & FILEUTILS_DEREF_SOFTLINK) /* -L */
flags |= FILEUTILS_DEREFERENCE;
/* The behavior of -H is *almost* like -L, but not quite, so let's
* just ignore it too for fun. TODO.
if (flags & OPT_H) ... // deref command-line params only if (flags & OPT_H) ... // deref command-line params only
*/ */

7
include/libbb.h
View File

@ -231,12 +231,13 @@ enum { /* DO NOT CHANGE THESE VALUES! cp.c, mv.c, install.c depend on them. */
FILEUTILS_INTERACTIVE = 0x10, FILEUTILS_INTERACTIVE = 0x10,
FILEUTILS_MAKE_HARDLINK = 0x20, FILEUTILS_MAKE_HARDLINK = 0x20,
FILEUTILS_MAKE_SOFTLINK = 0x40, FILEUTILS_MAKE_SOFTLINK = 0x40,
FILEUTILS_DEREF_SOFTLINK = 0x80,
#if ENABLE_SELINUX #if ENABLE_SELINUX
FILEUTILS_PRESERVE_SECURITY_CONTEXT = 0x80, FILEUTILS_PRESERVE_SECURITY_CONTEXT = 0x100,
FILEUTILS_SET_SECURITY_CONTEXT = 0x100 FILEUTILS_SET_SECURITY_CONTEXT = 0x200
#endif #endif
}; };
#define FILEUTILS_CP_OPTSTR "pdRfils" USE_SELINUX("c") #define FILEUTILS_CP_OPTSTR "pdRfilsL" USE_SELINUX("c")
extern int remove_file(const char *path, int flags); extern int remove_file(const char *path, int flags);
/* NB: without FILEUTILS_RECUR in flags, it will basically "cat" /* NB: without FILEUTILS_RECUR in flags, it will basically "cat"
* the source, not copy (unless "source" is a directory). * the source, not copy (unless "source" is a directory).

6
testsuite/cp/cp-RHL-does_not_preserve-links Normal file
View File

@ -0,0 +1,6 @@
mkdir a
>a/file
ln -s file a/link
busybox cp -RHL a b
test ! -L b/link
#sh </dev/tty >/dev/tty 2>&1