Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/busybox/patches/busybox-1.36.1-cp-ignore-onefilesystem.patch

    Contents of /trunk/busybox/patches/busybox-1.36.1-cp-ignore-onefilesystem.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3762 - (show annotations) (download)
    Sat Aug 12 12:01:27 2023 UTC (9 months ago) by niro
    File size: 1057 byte(s) 
    -rediffed for 1.36.1
    1 diff -Naur busybox-1.36.1/coreutils/cp.c busybox-1.36.1-one-filesystem/coreutils/cp.c
    2 --- busybox-1.36.1/coreutils/cp.c 2021-09-29 22:04:47.000000000 +0000
    3 +++ busybox-1.36.1-one-filesystem/coreutils/cp.c 2023-08-12 11:59:54.981504734 +0000
    4 @@ -140,7 +140,7 @@
    5 // -R (and therefore -r) turns on -d (coreutils does this)
    6 // -a = -pdR
    7 // -i overrides -n and vice versa (last wins)
    8 - "-1:l--s:s--l:Pd:rRd:Rd:apdR:i-n:n-i",
    9 + "-1:l--s:s--l:Pd:rRd:Rd:xapdR:i-n:n-i",
    10 "archive\0" No_argument "a"
    11 "force\0" No_argument "f"
    12 "interactive\0" No_argument "i"
    13 @@ -154,6 +154,7 @@
    14 "target-directory\0" Required_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 # if ENABLE_FEATURE_CP_REFLINK
    21 @@ -179,7 +180,7 @@
    22 flags = getopt32(argv, "^"
    23 FILEUTILS_CP_OPTSTR
    24 "\0"
    25 - "-1:l--s:s--l:Pd:rRd:Rd:apdR"
    26 + "-1:l--s:s--l:Pd:rRd:Rd:xapdR"
    27 , &last
    28 );
    29 #endif