diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2012-12-03 22:52:33 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2012-12-03 22:52:33 +0200 |
| commit | aded2b2188233e9eaf6afee37ee4094bc92b45e2 (patch) | |
| tree | ebc492d48efa4976873efb4b22a8f5e2772fdd3d /interpret.h | |
| parent | 71157f7f5f2fb9bf0fe588135485a8dcec322786 (diff) | |
| parent | 32323fa42c2c9079abf9a5fe92b2af8c523fd84b (diff) | |
| download | egawk-aded2b2188233e9eaf6afee37ee4094bc92b45e2.tar.gz egawk-aded2b2188233e9eaf6afee37ee4094bc92b45e2.tar.bz2 egawk-aded2b2188233e9eaf6afee37ee4094bc92b45e2.zip | |
Merge branch 'master' into array-iface
Diffstat (limited to 'interpret.h')
| -rw-r--r-- | interpret.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/interpret.h b/interpret.h index 0d1511ab..228a3f3e 100644 --- a/interpret.h +++ b/interpret.h @@ -670,8 +670,6 @@ mod: t1 = force_string(*lhs); t2 = POP_STRING(); - free_wstr(*lhs); - if (t1 != *lhs) { unref(*lhs); *lhs = dupnode(t1); @@ -685,6 +683,20 @@ mod: t1->stlen = nlen; t1->stptr[nlen] = '\0'; t1->flags &= ~(NUMCUR|NUMBER|NUMINT); + +#if MBS_SUPPORT + if ((t1->flags & WSTRCUR) != 0 && (t2->flags & WSTRCUR) != 0) { + size_t wlen = t1->wstlen + t2->wstlen; + + erealloc(t1->wstptr, wchar_t *, + sizeof(wchar_t) * (wlen + 2), "r_interpret"); + memcpy(t1->wstptr + t1->wstlen, t2->wstptr, t2->wstlen); + t1->wstlen = wlen; + t1->wstptr[wlen] = L'\0'; + t1->flags |= WSTRCUR; + } else + free_wstr(*lhs); +#endif } else { size_t nlen = t1->stlen + t2->stlen; char *p; |