From 467c50f9eb2ba9d712065e3d4eecd1a0f4b936c9 Mon Sep 17 00:00:00 2001 From: "Stephen R. van den Berg" <srb@cuci.nl> Date: Sat, 2 Jan 2010 14:16:27 +0100 Subject: [PATCH] Support wide strings. Rev: lib/modules/Parser.pmod/Tabular.pike:1.8 --- lib/modules/Parser.pmod/Tabular.pike | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/modules/Parser.pmod/Tabular.pike b/lib/modules/Parser.pmod/Tabular.pike index e0a073dd7d..e94bc3f740 100644 --- a/lib/modules/Parser.pmod/Tabular.pike +++ b/lib/modules/Parser.pmod/Tabular.pike @@ -352,6 +352,8 @@ csvready: } } string out=replace(s[..<1]*"",({"\n"," "," "}),({""," "," "})); + if(String.width(out)>8) + out=string_to_utf8(out); if(verb>0) werror("%d %.*s\r",recordcount,verb,out); else @@ -385,7 +387,7 @@ private void add2map(mapping res,string name,mixed entry) //! @[fetch()] int skipemptylines() { string line; int eof=1; - while((line=in->gets()) && emptyline->match(line)) + while((line=in->gets()) && String.width(line)==8 && emptyline->match(line)) recordcount++; if(line) eof=0,in->unread(line+"\n"); -- GitLab