Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

patchutils: Update to 0.4.3

Browse Source
This commit is contained in:
Jannick
2025-08-26 22:59:03 +02:00
committed by Christoph Reiter
parent 0f28a132cb
commit 037ec937c6
2 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
patchutils/0001-patchutils-0.4.3_interdiff.c-fix-MEMCPY-arguments.patch Normal file
View File

@@ -0,0 +1,52 @@
From 2303aa8bada1af6de8111cc36203b99f4587f563 Mon Sep 17 00:00:00 2001
From: Jannick <thirdedition@gmx.net>
Date: Tue, 26 Aug 2025 20:59:01 +0200
Subject: [PATCH] interdiff.c: fix MEMCPY arguments
---
src/interdiff.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/interdiff.c b/src/interdiff.c
index 31fcc34..54d6c0f 100644
--- a/src/interdiff.c
+++ b/src/interdiff.c
@@ -832,9 +832,9 @@ output_patch1_only (FILE *p1, FILE *out, int not_reverted)
fflush (NULL);
char *argv[2 + num_diff_opts + 2 + 1];
- memcpy (argv, (const char *[]) { DIFF, options }, 2 * sizeof (char *));
+ memcpy (argv, ((const char *[]) { DIFF, options }), 2 * sizeof (char *));
memcpy (argv + 2, diff_opts, num_diff_opts * sizeof (char *));
- memcpy (argv + 2 + num_diff_opts, (char *[]) { tmpp1, tmpp2, NULL }, (2 + 1) * sizeof (char *));
+ memcpy (argv + 2 + num_diff_opts, ((char *[]) { tmpp1, tmpp2, NULL }), (2 + 1) * sizeof (char *));
in = xpipe (DIFF, &child, "r", argv);
/* Eat the first line */
@@ -1194,9 +1194,9 @@ output_delta (FILE *p1, FILE *p2, FILE *out)
fflush (NULL);
char *argv[2 + num_diff_opts + 2 + 1];
- memcpy (argv, (const char *[]) { DIFF, options }, 2 * sizeof (char *));
+ memcpy (argv, ((const char *[]) { DIFF, options }), 2 * sizeof (char *));
memcpy (argv + 2, diff_opts, num_diff_opts * sizeof (char *));
- memcpy (argv + 2 + num_diff_opts, (char *[]) { tmpp1, tmpp2, NULL }, (2 + 1) * sizeof (char *));
+ memcpy (argv + 2 + num_diff_opts, ((char *[]) { tmpp1, tmpp2, NULL }), (2 + 1) * sizeof (char *));
in = xpipe (DIFF, &child, "r", argv);
/* Eat the first line */
@@ -1613,9 +1613,9 @@ take_diff (const char *f1, const char *f2, char *headers[2],
sprintf (options, "-U%d", max_context);
char *argv[2 + num_diff_opts + 2 + 1];
- memcpy (argv, (const char *[]) { DIFF, options }, 2 * sizeof (char *));
+ memcpy (argv, ((const char *[]) { DIFF, options }), 2 * sizeof (char *));
memcpy (argv + 2, diff_opts, num_diff_opts * sizeof (char *));
- memcpy (argv + 2 + num_diff_opts, (const char *[]) { f1, f2, NULL }, (2 + 1) * sizeof (char *));
+ memcpy (argv + 2 + num_diff_opts, ((const char *[]) { f1, f2, NULL }), (2 + 1) * sizeof (char *));
if (debug) {
fputs ("+", stdout);
for (int i = 0; argv[i]; i++) {
--
2.51.0