Annotation of /trunk/busybox/patches/busybox-1.25.1-cp-ignore-onefilesystem.patch
Parent Directory
| 
Revision Log
Revision 2838 -
(hide annotations)
(download)
Thu Oct 27 12:15:33 2016 UTC (7 years, 10 months ago) by niro
File size: 808 byte(s)
Thu Oct 27 12:15:33 2016 UTC (7 years, 10 months ago) by niro
File size: 808 byte(s)
-re-diffed for 1.25.1
| 1 | niro | 2838 | diff -Naur busybox-1.25.1/coreutils/cp.c busybox-1.25.1-alx/coreutils/cp.c |
| 2 | --- busybox-1.25.1/coreutils/cp.c 2016-09-27 18:53:50.000000000 +0200 | ||
| 3 | +++ busybox-1.25.1-alx/coreutils/cp.c 2016-10-27 14:14:31.875550139 +0200 | ||
| 4 | @@ -63,7 +63,7 @@ | ||
| 5 | // -r and -R are the same | ||
| 6 | // -R (and therefore -r) turns on -d (coreutils does this) | ||
| 7 | // -a = -pdR | ||
| 8 | - opt_complementary = "-2:l--s:s--l:Pd:rRd:Rd:apdR"; | ||
| 9 | + opt_complementary = "-2:l--s:s--l:Pd:rRd:Rd:xapdR"; | ||
| 10 | #if ENABLE_FEATURE_CP_LONG_OPTIONS | ||
| 11 | applet_long_options = | ||
| 12 | "archive\0" No_argument "a" | ||
| 13 | @@ -76,6 +76,7 @@ | ||
| 14 | "symbolic-link\0" No_argument "s" | ||
| 15 | "verbose\0" No_argument "v" | ||
| 16 | "update\0" No_argument "u" | ||
| 17 | + "one-file-system\0" No_argument "x" | ||
| 18 | "remove-destination\0" No_argument "\xff" | ||
| 19 | "parents\0" No_argument "\xfe" | ||
| 20 | ; |