From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9899 invoked by alias); 28 Oct 2011 09:57:43 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 29879 Received: (qmail 10542 invoked from network); 28 Oct 2011 09:57:30 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS autolearn=ham version=3.3.1 Received-SPF: none (ns1.primenet.com.au: domain at csr.com does not designate permitted sender hosts) Date: Fri, 28 Oct 2011 10:57:12 +0100 From: Peter Stephenson To: Subject: Re: message from zmodload can be corrupted Message-ID: <20111028105712.54cdb4cc@pwslap01u.europe.root.pri> In-Reply-To: <20111027.201011.14682980.takimoto-j@kba.biglobe.ne.jp> References: <20111027.201011.14682980.takimoto-j@kba.biglobe.ne.jp> Organization: Cambridge Silicon Radio X-Mailer: Claws Mail 3.7.9 (GTK+ 2.22.0; i386-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.101.11.233] X-Scanned-By: MailControl 7.6.3 (www.mailcontrol.com) on 10.71.0.135 On Thu, 27 Oct 2011 20:10:11 +0900 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 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