Skip to content

Commit f854b11

Browse files
committed
backport changes to 8.32 patch
1 parent dfb9623 commit f854b11

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

advcpmv-0.8-8.32.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff -aur coreutils-8.32/src/copy.c coreutils-8.32-patched/src/copy.c
22
--- coreutils-8.32/src/copy.c 2020-01-01 15:13:12.000000000 +0100
3-
+++ coreutils-8.32-patched/src/copy.c 2022-02-13 16:14:31.534047672 +0100
3+
+++ coreutils-8.32-patched/src/copy.c 2022-02-14 21:10:42.216002503 +0100
44
@@ -129,6 +129,133 @@
55
dev_t dev;
66
};
@@ -488,7 +488,7 @@ diff -aur coreutils-8.32/src/copy.c coreutils-8.32-patched/src/copy.c
488488

489489
diff -aur coreutils-8.32/src/copy.h coreutils-8.32-patched/src/copy.h
490490
--- coreutils-8.32/src/copy.h 2020-01-01 15:13:12.000000000 +0100
491-
+++ coreutils-8.32-patched/src/copy.h 2022-02-13 16:14:31.538047737 +0100
491+
+++ coreutils-8.32-patched/src/copy.h 2022-02-14 21:10:42.220002638 +0100
492492
@@ -234,6 +234,11 @@
493493
Create destination directories as usual. */
494494
bool symbolic_link;
@@ -526,7 +526,7 @@ diff -aur coreutils-8.32/src/copy.h coreutils-8.32-patched/src/copy.h
526526
#endif
527527
diff -aur coreutils-8.32/src/cp.c coreutils-8.32-patched/src/cp.c
528528
--- coreutils-8.32/src/cp.c 2020-01-01 15:13:12.000000000 +0100
529-
+++ coreutils-8.32-patched/src/cp.c 2022-02-13 16:14:31.538047737 +0100
529+
+++ coreutils-8.32-patched/src/cp.c 2022-02-14 21:10:42.220002638 +0100
530530
@@ -131,6 +131,9 @@
531531
{"symbolic-link", no_argument, NULL, 's'},
532532
{"target-directory", required_argument, NULL, 't'},
@@ -588,7 +588,7 @@ diff -aur coreutils-8.32/src/cp.c coreutils-8.32-patched/src/cp.c
588588
+ FILE *fp ;
589589
+ char output[1024];
590590
+ char fcmd[] = "find";
591-
+ fp = spawn(fcmd, (char *[]){ fcmd, file[0], NULL, "-type", "f", NULL });
591+
+ fp = spawn(fcmd, (char *[]){ fcmd, file[0], "-type", "f", NULL });
592592
+ if ( fp == NULL)
593593
+ printf("failed to run find\r");
594594
+ else
@@ -730,7 +730,7 @@ diff -aur coreutils-8.32/src/cp.c coreutils-8.32-patched/src/cp.c
730730
break;
731731
diff -aur coreutils-8.32/src/mv.c coreutils-8.32-patched/src/mv.c
732732
--- coreutils-8.32/src/mv.c 2020-01-01 15:13:12.000000000 +0100
733-
+++ coreutils-8.32-patched/src/mv.c 2022-02-13 16:14:31.542047802 +0100
733+
+++ coreutils-8.32-patched/src/mv.c 2022-02-14 21:10:42.220002638 +0100
734734
@@ -66,6 +66,9 @@
735735
{"target-directory", required_argument, NULL, 't'},
736736
{"update", no_argument, NULL, 'u'},
@@ -771,7 +771,7 @@ diff -aur coreutils-8.32/src/mv.c coreutils-8.32-patched/src/mv.c
771771
+ FILE *fp ;
772772
+ char output[1024];
773773
+ char fcmd[] = "find";
774-
+ fp = spawn(fcmd, (char *[]){ fcmd, (unsigned char *)(size_t)source, NULL, "-type", "f", NULL });
774+
+ fp = spawn(fcmd, (char *[]){ fcmd, (char *)source, "-type", "f", NULL });
775775
+ if ( fp == NULL)
776776
+ printf("failed to run find\r");
777777
+ else

0 commit comments

Comments
 (0)