diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-27 22:06:24 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-27 22:06:24 +0000 |
| commit | c0431ed455a601ddbfcd9f30d6397d4e9145cf54 (patch) | |
| tree | 7eade59699338d065827751d37e72e45d2b4440b /coreutils/cp.c | |
| parent | 4809a9f78eecc7346e5d73b7f60ae6c51e057632 (diff) | |
| download | busybox-w32-c0431ed455a601ddbfcd9f30d6397d4e9145cf54.tar.gz busybox-w32-c0431ed455a601ddbfcd9f30d6397d4e9145cf54.tar.bz2 busybox-w32-c0431ed455a601ddbfcd9f30d6397d4e9145cf54.zip | |
cp: fix "cp -RL" to create regular files even if src is a symlink
Diffstat (limited to 'coreutils/cp.c')
| -rw-r--r-- | coreutils/cp.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/coreutils/cp.c b/coreutils/cp.c index a4eea9498..40d3625b3 100644 --- a/coreutils/cp.c +++ b/coreutils/cp.c | |||
| @@ -37,25 +37,27 @@ int cp_main(int argc, char **argv) | |||
| 37 | OPT_r = 1 << (sizeof(FILEUTILS_CP_OPTSTR)), | 37 | OPT_r = 1 << (sizeof(FILEUTILS_CP_OPTSTR)), |
| 38 | OPT_P = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+1), | 38 | OPT_P = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+1), |
| 39 | OPT_H = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+2), | 39 | OPT_H = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+2), |
| 40 | OPT_L = 1 << (sizeof(FILEUTILS_CP_OPTSTR)+3), | ||
| 41 | }; | 40 | }; |
| 42 | 41 | ||
| 43 | // Need at least two arguments | 42 | // Need at least two arguments |
| 44 | // Soft- and hardlinking don't mix | 43 | // Soft- and hardlinking doesn't mix |
| 45 | // -P and -d are the same (-P is POSIX, -d is GNU) | 44 | // -P and -d are the same (-P is POSIX, -d is GNU) |
| 46 | // -r and -R are the same | 45 | // -r and -R are the same |
| 47 | // -R (and therefore -r) turns on -d (coreutils does this) | 46 | // -R (and therefore -r) turns on -d (coreutils does this) |
| 48 | // -a = -pdR | 47 | // -a = -pdR |
| 49 | opt_complementary = "-2:l--s:s--l:Pd:rRd:Rd:apdR"; | 48 | opt_complementary = "-2:l--s:s--l:Pd:rRd:Rd:apdR:HL"; |
| 50 | flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPHL"); | 49 | flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPH"); |
| 51 | argc -= optind; | 50 | argc -= optind; |
| 52 | argv += optind; | 51 | argv += optind; |
| 53 | flags ^= FILEUTILS_DEREFERENCE; /* The sense of this flag was reversed. */ | 52 | flags ^= FILEUTILS_DEREFERENCE; /* the sense of this flag was reversed */ |
| 54 | /* Default behavior of cp is to dereference, so we don't have to do | 53 | /* coreutils 6.9 compat: |
| 55 | * anything special when we are given -L. | 54 | * by default, "cp" derefs symlinks (creates regular dest files), |
| 56 | * The behavior of -H is *almost* like -L, but not quite, so let's | 55 | * but "cp -R" does not. We switch off deref if -r or -R (see above). |
| 57 | * just ignore it too for fun. | 56 | * However, "cp -RL" must still deref symlinks: */ |
| 58 | if (flags & OPT_L) ... | 57 | if (flags & FILEUTILS_DEREF_SOFTLINK) /* -L */ |
| 58 | flags |= FILEUTILS_DEREFERENCE; | ||
| 59 | /* The behavior of -H is *almost* like -L, but not quite, so let's | ||
| 60 | * just ignore it too for fun. TODO. | ||
| 59 | if (flags & OPT_H) ... // deref command-line params only | 61 | if (flags & OPT_H) ... // deref command-line params only |
| 60 | */ | 62 | */ |
| 61 | 63 | ||