From 96d189c9008adabdec343217e5b47f3927312d93 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 12 May 2021 23:31:47 -0700 Subject: cygwin: fix broken string catenation. * lib.c (cat_str, vscat, scat3, join_with): Pass onech rather than wref(onech) to cat_str_init. Reason being, cat_str_init calls wref(onech). --- lib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib.c b/lib.c index 3f2a9616..c5f3b476 100644 --- a/lib.c +++ b/lib.c @@ -4985,7 +4985,7 @@ val cat_str(val items, val sep) wchar_t onech[] = wini(" "); - cat_str_init(&cs, sep, wref(onech), self); + cat_str_init(&cs, sep, onech, self); seq_iter_init(self, &item_iter, items); more = seq_get(&item_iter, &item); @@ -5014,7 +5014,7 @@ static val vscat(val sep, va_list vl1, va_list vl2, val self) struct cat_str cs; wchar_t onech[] = wini(" "); - cat_str_init(&cs, sep, wref(onech), self); + cat_str_init(&cs, sep, onech, self); for (item = va_arg(vl1, val); item != nao; item = next) { @@ -5070,7 +5070,7 @@ val scat3(val s1, val sep, val s2) struct cat_str cs; wchar_t onech[] = wini(" "); - cat_str_init(&cs, sep, wref(onech), self); + cat_str_init(&cs, sep, onech, self); cat_str_measure(&cs, s1, 1, self); cat_str_measure(&cs, s2, 0, self); @@ -5092,7 +5092,7 @@ val join_with(val sep, struct args *args) struct cat_str cs; wchar_t onech[] = wini(" "); - cat_str_init(&cs, sep, wref(onech), self); + cat_str_init(&cs, sep, onech, self); for (index = 0, iter = args->list, more = args_more_nozap(args, index, iter); more;) -- cgit v1.2.3