Contents of /trunk/busybox/patches/busybox-1.29.2-cp-ignore-onefilesystem.patch
Parent Directory
| 
Revision Log
Revision 3209 -
(show annotations)
(download)
Wed Aug 15 13:49:28 2018 UTC (5 years, 9 months ago) by niro
File size: 998 byte(s)
Wed Aug 15 13:49:28 2018 UTC (5 years, 9 months ago) by niro
File size: 998 byte(s)
-re-diffed for 1.29.2
| 1 | diff -Naur busybox-1.29.2/coreutils/cp.c busybox-1.29.2-alx/coreutils/cp.c |
| 2 | --- busybox-1.29.2/coreutils/cp.c 2018-07-02 13:23:06.000000000 +0200 |
| 3 | +++ busybox-1.29.2-alx/coreutils/cp.c 2018-08-15 15:47:47.942380380 +0200 |
| 4 | @@ -85,7 +85,7 @@ |
| 5 | // -r and -R are the same |
| 6 | // -R (and therefore -r) turns on -d (coreutils does this) |
| 7 | // -a = -pdR |
| 8 | - "-2:l--s:s--l:Pd:rRd:Rd:apdR", |
| 9 | + "-2:l--s:s--l:Pd:rRd:Rd:xapdR", |
| 10 | "archive\0" No_argument "a" |
| 11 | "force\0" No_argument "f" |
| 12 | "interactive\0" No_argument "i" |
| 13 | @@ -97,6 +97,7 @@ |
| 14 | "no-target-directory\0" No_argument "T" |
| 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 | ); |
| 21 | @@ -104,7 +105,7 @@ |
| 22 | flags = getopt32(argv, "^" |
| 23 | FILEUTILS_CP_OPTSTR |
| 24 | "\0" |
| 25 | - "-2:l--s:s--l:Pd:rRd:Rd:apdR" |
| 26 | + "-2:l--s:s--l:Pd:rRd:Rd:xapdR" |
| 27 | ); |
| 28 | #endif |
| 29 | /* Options of cp from GNU coreutils 6.10: |