improved wchar concat

This commit is contained in:
kzak 2006-02-14 08:47:27 +00:00
parent 08d741ec70
commit 70435401bc
2 changed files with 14 additions and 5 deletions

View File

@ -1,10 +1,16 @@
--- gawk-3.1.5/eval.c.wconcat 2006-02-10 22:45:26.000000000 +0100
+++ gawk-3.1.5/eval.c 2006-02-10 22:46:01.000000000 +0100
@@ -1176,6 +1176,7 @@
--- gawk-3.1.5/eval.c.wconcat 2006-02-14 09:40:54.000000000 +0100
+++ gawk-3.1.5/eval.c 2006-02-14 09:43:33.000000000 +0100
@@ -1176,6 +1176,13 @@
memcpy(l->stptr + l->stlen, r->stptr, r->stlen);
l->stlen += r->stlen;
l->stptr[l->stlen] = '\0';
+ l->flags &= ~WSTRCUR;
+#if defined MBS_SUPPORT
+ if (r->wstptr != NULL)
+ free(r->wstptr);
+ r->wstptr = NULL;
+ r->wstlen = 0;
+ r->flags &= ~WSTRCUR;
+#endif /* MBS_SUPPORT */
} else {
char *nval;
size_t nlen = l->stlen + r->stlen + 2;

View File

@ -1,7 +1,7 @@
Summary: The GNU version of the awk text processing utility.
Name: gawk
Version: 3.1.5
Release: 6.1
Release: 6.2
License: GPL
Group: Applications/Text
Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
@ -81,6 +81,9 @@ fi
%{_datadir}/awk
%changelog
* Tue Feb 14 2006 Karel Zak <kzak@redhat.com> 3.1.5-6.2
- new version of the gawk-3.1.5-wconcat.patch patch
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 3.1.5-6.1
- bump again for double-long bug on ppc(64)