message from zmodload can be corrupted

message from zmodload can be corrupted

[takimoto-j]

I noticed that on recent Fedora's (and maybe many other Linuxes)
the error message returned by dlerror() is "localized" and
can contain multibyte characters depending on the locale in use.
THen the message is unmetafied in nicezputs() and corrupted.
For example, in Japanese locale:

zsh$ echo $LANG
ja_JP.UTF-8
zsh$ zmodload zsh/foo
zsh: failed to load module `zsh/foo': /usr/local/lib/zsh/4.3.12-test-2/zsh/foo.so: \M-e$\M-1\M-f\)オ\M-c^ジェク\M-c^H\M-c^_ァイ\M-c\M-^K\M-c\M-^B<\M-i~=\M-c\M-^A`ま\M-c\M-^A\\M-c\M-^B>: \M-c\M-^Aの\M-c\M-^B(\M-c\M-^A^な\M-c^_ァイ\M-c\M-^K\M-c\M-^B#\M-c\nィ\M-c\M-^Lク\M-c^H\M-c\M-\nはあ\M-c\M-^B$ま\M-c\M-^A\\M-c\M-^B>

The following patch fixes this problem, but I don't know whether I'm on
the right track.

zsh-fixed$ zmodload zsh/foo
zsh: failed to load module `zsh/foo': /usr/local/lib/zsh/4.3.12-test-2/zsh/foo.so: 共有オブジェクトファイルを開けません: そのようなファイルやディレクトリはありません


Index: Src/module.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/module.c,v
retrieving revision 1.43
diff -u -r1.43 module.c
--- Src/module.c	10 Aug 2011 11:31:19 -0000	1.43
+++ Src/module.c	27 Oct 2011 09:57:53 -0000
@@ -1597,7 +1597,9 @@
     ret = try_load_module(name);
     if (!ret && !silent) {
 #ifdef HAVE_DLERROR
-	zwarn("failed to load module `%s': %s", name, dlerror());
+	char *metafied = metafy(dlerror(),-1,META_DUP);
+	zwarn("failed to load module `%s': %s", name, metafied);
+	free(metafied);
 #else
 	zwarn("failed to load module: %s", name);
 #endif

Re: message from zmodload can be corrupted

[Peter Stephenson]

On Thu, 27 Oct 2011 20:10:11 +0900
<takimoto-j@kba.biglobe.ne.jp> wrote:
> I noticed that on recent Fedora's (and maybe many other Linuxes)
> the error message returned by dlerror() is "localized" and
> can contain multibyte characters depending on the locale in use.
> THen the message is unmetafied in nicezputs() and corrupted.
> 
> The following patch fixes this problem, but I don't know whether I'm on
> the right track.

Thanks, that would do fine, although I'll apply the slightly more
compact

Index: Src/module.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/module.c,v
retrieving revision 1.43
diff -p -u -r1.43 module.c
--- Src/module.c	10 Aug 2011 11:31:19 -0000	1.43
+++ Src/module.c	28 Oct 2011 09:55:36 -0000
@@ -1597,7 +1597,8 @@ do_load_module(char const *name, int sil
     ret = try_load_module(name);
     if (!ret && !silent) {
 #ifdef HAVE_DLERROR
-	zwarn("failed to load module `%s': %s", name, dlerror());
+	zwarn("failed to load module `%s': %s", name,
+	      metafy(dlerror(), -1, META_USEHEAP));
 #else
 	zwarn("failed to load module: %s", name);
 #endif

-- 
Peter Stephenson <pws@csr.com>            Software Engineer
Tel: +44 (0)1223 692070                   Cambridge Silicon Radio Limited
Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, UK


Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog