From c8e48efb39a35a1f9e7977139fbf5719c0552a9c Mon Sep 17 00:00:00 2001 From: Stathis Kamperis Date: Mon, 16 Aug 2010 20:42:24 +0300 Subject: [PATCH] awk: Tweak local patch to apply cleanly to new awk --- usr.bin/awk/patches/run.c.patch | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/usr.bin/awk/patches/run.c.patch b/usr.bin/awk/patches/run.c.patch index 83ec881470..08d958fcf5 100644 --- a/usr.bin/awk/patches/run.c.patch +++ b/usr.bin/awk/patches/run.c.patch @@ -1,13 +1,8 @@ -$DragonFly: src/usr.bin/awk/patches/run.c.patch,v 1.1 2004/11/09 08:47:36 joerg Exp $ - -Index: /run.c -=================================================================== -RCS file: /home/dcvs/src/contrib/awk20040207/run.c,v -retrieving revision 1.1.1.1 -diff -u -p -r1.1.1.1 run.c ---- run.c 17 Apr 2004 19:41:28 -0000 1.1.1.1 -+++ run.c 31 Oct 2004 03:58:23 -0000 -@@ -1145,13 +1145,13 @@ Cell *cat(Node **a, int q) /* a[0] cat a +diff --git a/contrib/awk20100523/run.c b/contrib/awk20100523/run.c +index 88e0f8f..8db0af3 100644 +--- a/contrib/awk20100523/run.c ++++ b/contrib/awk20100523/run.c +@@ -1152,13 +1152,13 @@ Cell *cat(Node **a, int q) /* a[0] cat a[1] */ getsval(x); getsval(y); n1 = strlen(x->sval); @@ -22,6 +17,6 @@ diff -u -p -r1.1.1.1 run.c - strcpy(s+n1, y->sval); + memmove(s, x->sval, n1); + memmove(s+n1, y->sval, n2); + tempfree(x); tempfree(y); z = gettemp(); - z->sval = s; -- 2.41.0