From owner-svn-src-projects@FreeBSD.ORG Fri Mar 27 01:48:56 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 06A1BD33; Fri, 27 Mar 2015 01:48:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E6178C46; Fri, 27 Mar 2015 01:48:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2R1mti0024337; Fri, 27 Mar 2015 01:48:55 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2R1mtBx024335; Fri, 27 Mar 2015 01:48:55 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201503270148.t2R1mtBx024335@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Fri, 27 Mar 2015 01:48:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280724 - projects/lua-bootloader/sys/boot/liblua X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2015 01:48:56 -0000 Author: rpaulo Date: Fri Mar 27 01:48:54 2015 New Revision: 280724 URL: https://svnweb.freebsd.org/changeset/base/280724 Log: My previous attempt at implementing lua_writestring() didn't work because write(1, ...) isn't correctly handled by libstand. Rework the code to use luai_writestring Modified: projects/lua-bootloader/sys/boot/liblua/lstd.c projects/lua-bootloader/sys/boot/liblua/lstd.h Modified: projects/lua-bootloader/sys/boot/liblua/lstd.c ============================================================================== --- projects/lua-bootloader/sys/boot/liblua/lstd.c Fri Mar 27 01:48:05 2015 (r280723) +++ projects/lua-bootloader/sys/boot/liblua/lstd.c Fri Mar 27 01:48:54 2015 (r280724) @@ -420,14 +420,12 @@ strstr(const char *s, const char *find) return ((char *)s); } -#if 0 void luai_writestring(const char *s, int i) { while (i-- > 0) putchar(*s++); } -#endif int iscntrl(int c) Modified: projects/lua-bootloader/sys/boot/liblua/lstd.h ============================================================================== --- projects/lua-bootloader/sys/boot/liblua/lstd.h Fri Mar 27 01:48:05 2015 (r280723) +++ projects/lua-bootloader/sys/boot/liblua/lstd.h Fri Mar 27 01:48:54 2015 (r280724) @@ -115,9 +115,10 @@ _l_getlocaledecpoint(void) (printf((s), (p))) #endif +void luai_writestring(const char *, int); + #ifndef lua_writestring -#define lua_writestring(s,l) \ - (write(1, __DECONST(void *, (s)), (l))) +#define lua_writestring(s,l) luai_writestring(s,l) #endif #define stdout 1