CVS commit: src/distrib/notes/common
Module Name:src Committed By: salazar Date: Thu Apr 14 21:16:18 UTC 2016 Modified Files: src/distrib/notes/common: main Log Message: add lneto To generate a diff of this commit: cvs rdiff -u -r1.524 -r1.525 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.524 src/distrib/notes/common/main:1.525 --- src/distrib/notes/common/main:1.524 Thu Aug 13 13:21:04 2015 +++ src/distrib/notes/common/main Thu Apr 14 21:16:18 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.524 2015/08/13 13:21:04 leot Exp $ +.\" $NetBSD: main,v 1.525 2016/04/14 21:16:18 salazar Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -1314,6 +1314,7 @@ If you're one of them, and would like to .It Ta Alexander Nasonov Ta Mt al...@netbsd.org .It Ta Phil Nelson Ta Mt p...@netbsd.org .It Ta John Nemeth Ta Mt jnem...@netbsd.org +.It Ta Lourival Pereira Vieira Neto Ta Mt ln...@netbsd.org .It Ta NISHIMURA Takeshi Ta Mt nsmr...@netbsd.org .It Ta Tohru Nishimura Ta Mt nisim...@netbsd.org .It Ta NONAKA Kimihiro Ta Mt non...@netbsd.org
CVS commit: src/share/man/man9
Module Name:src
Committed By: salazar
Date: Thu May 5 17:06:41 UTC 2016
Modified Files:
src/share/man/man9: namei.9
Log Message:
update struct nameidata documentation
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/share/man/man9/namei.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/namei.9
diff -u src/share/man/man9/namei.9:1.34 src/share/man/man9/namei.9:1.35
--- src/share/man/man9/namei.9:1.34 Tue Apr 21 10:00:30 2015
+++ src/share/man/man9/namei.9 Thu May 5 17:06:41 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: namei.9,v 1.34 2015/04/21 10:00:30 wiz Exp $
+.\" $NetBSD: namei.9,v 1.35 2016/05/05 17:06:41 salazar Exp $
.\"
.\" Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd April 21, 2015
+.Dd May 05, 2016
.Dt NAMEI 9
.Os
.Sh NAME
@@ -84,45 +84,54 @@ structure.
It has the following layout:
.Bd -literal
struct nameidata {
-/*
- * Arguments to namei/lookup.
- */
-struct vnode *ni_startdir; /* starting dir, cwd if null */
-struct pathbuf *ni_pathbuf; /* pathname container */
-char *ni_pnbuf; /* extra pathname buffer ref (XXX) */
-/*
- * Arguments to lookup.
- */
-struct vnode *ni_startdir; /* starting directory */
-struct vnode *ni_rootdir; /* logical root directory */
-/*
- * Results: returned from/manipulated by lookup
- */
-struct vnode *ni_vp; /* vnode of result */
-struct vnode *ni_dvp; /* vnode of intermediate dir */
-/*
- * Shared between namei and lookup/commit routines.
- */
-size_t ni_pathlen; /* remaining chars in path */
-const char *ni_next;/* next location in pathname */
-unsigned int ni_loopcnt;/* count of symlinks encountered */
-/*
- * Lookup parameters
- */
-struct componentname {
-/*
- * Arguments to lookup.
- */
-uint32_t cn_nameiop;/* namei operation */
-uint32_t cn_flags; /* flags to namei */
-kauth_cred_t cn_cred; /* credentials */
-/*
- * Shared between lookup and commit routines.
- */
-const char *cn_nameptr; /* pointer to looked up name */
-size_t cn_namelen; /* length of looked up component */
-size_t cn_consume; /* chars to be consumed this time */
-} ni_cnd;
+ /*
+ * Arguments to namei/lookup.
+ */
+ struct vnode *ni_atdir; /* startup dir, cwd if null */
+ struct pathbuf *ni_pathbuf; /* pathname container */
+ char *ni_pnbuf; /* extra pathname buffer ref (XXX) */
+ /*
+ * Arguments to lookup.
+ */
+ struct vnode *ni_rootdir; /* logical root directory */
+ struct vnode *ni_erootdir; /* emulation root directory */
+ /*
+ * Results: returned from/manipulated by lookup
+ */
+ struct vnode *ni_vp; /* vnode of result */
+ struct vnode *ni_dvp; /* vnode of intermediate directory */
+ /*
+ * Shared between namei and lookup/commit routines.
+ */
+ size_t ni_pathlen; /* remaining chars in path */
+ const char *ni_next; /* next location in pathname */
+ unsigned int ni_loopcnt; /* count of symlinks encountered */
+ /*
+ * Lookup parameters: this structure describes the subset of
+ * information from the nameidata structure that is passed
+ * through the VOP interface.
+ */
+ struct componentname ni_cnd;
+};
+.Ed
+.Pp
+The
+.Em componentname
+structure has the following layout:
+.Bd -literal
+struct componentname {
+ /*
+ * Arguments to lookup.
+ */
+ uint32_t cn_nameiop; /* namei operation */
+ uint32_t cn_flags; /* flags to namei */
+ kauth_cred_t cn_cred; /* credentials */
+ /*
+ * Shared between lookup and commit routines.
+ */
+ const char *cn_nameptr; /* pointer to looked up name */
+ size_t cn_namelen; /* length of looked up comp */
+ size_t cn_consume; /* chars to consume in lookup */
};
.Ed
.Pp
CVS commit: src/sys/modules/lua
Module Name:src
Committed By: salazar
Date: Sat May 21 12:39:33 UTC 2016
Modified Files:
src/sys/modules/lua: lua.c
Log Message:
fix double require bug
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/modules/lua/lua.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.16 src/sys/modules/lua/lua.c:1.17
--- src/sys/modules/lua/lua.c:1.16 Sat Feb 7 04:09:13 2015
+++ src/sys/modules/lua/lua.c Sat May 21 12:39:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lua.c,v 1.16 2015/02/07 04:09:13 christos Exp $ */
+/* $NetBSD: lua.c,v 1.17 2016/05/21 12:39:32 salazar Exp $ */
/*
* Copyright (c) 2014 by Lourival Vieira Neto .
@@ -355,7 +355,10 @@ luaioctl(dev_t dev, u_long cmd, void *da
case LUAREQUIRE: /* 'require' a module in a State */
require = data;
LIST_FOREACH(s, &lua_states, lua_next)
- if (!strcmp(s->lua_name, require->state))
+ if (!strcmp(s->lua_name, require->state)) {
+LIST_FOREACH(m, &s->lua_modules, mod_next)
+ if (!strcmp(m->mod_name, require->module))
+ return ENXIO;
LIST_FOREACH(m, &lua_modules, mod_next)
if (!strcmp(m->mod_name,
require->module)) {
@@ -379,6 +382,7 @@ luaioctl(dev_t dev, u_long cmd, void *da
mod_next);
return 0;
}
+ }
return ENXIO;
case LUALOAD:
load = data;
CVS commit: src/share/misc
Module Name:src
Committed By: salazar
Date: Mon May 23 11:41:06 UTC 2016
Modified Files:
src/share/misc: style
Log Message:
fix spelling mistakes
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/share/misc/style
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/style
diff -u src/share/misc/style:1.52 src/share/misc/style:1.53
--- src/share/misc/style:1.52 Sat Oct 24 15:46:09 2015
+++ src/share/misc/style Mon May 23 11:41:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: style,v 1.52 2015/10/24 15:46:09 christos Exp $ */
+/* $NetBSD: style,v 1.53 2016/05/23 11:41:06 salazar Exp $ */
/*
* The revision control tag appears first, with a blank line after it.
@@ -30,7 +30,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: style,v 1.52 2015/10/24 15:46:09 christos Exp $");
+__RCSID("$NetBSD: style,v 1.53 2016/05/23 11:41:06 salazar Exp $");
/*
* VERY important single-line comments look like this.
@@ -367,7 +367,7 @@ function(int a1, int a2, float fl, int a
* where we don't have control over the NULL definition (on NetBSD
* it is defined as ((void *)0), but on other systems it can be
* defined as (0) and both definitions are valid under ANSI C), it
- * it advised to cast NULL to a pointer on varyadic functions,
+ * it advised to cast NULL to a pointer on variadic functions,
* because on machines where sizeof(pointer) != sizeof(int) and in
* the absence of a prototype in scope, passing an un-casted NULL,
* will result in passing an int on the stack instead of a pointer.
@@ -414,7 +414,7 @@ dirinfo(const char *p, struct stat *sb,
err(1, "Unable to stat %s", p);
/*
- * To printf quantities that might be larger that "long", include
+ * To printf quantities that might be larger than "long", include
* , cast quantities to intmax_t or uintmax_t and use
* PRI?MAX constants.
*/
CVS commit: src/doc
Module Name:src Committed By: salazar Date: Tue May 24 17:11:14 UTC 2016 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Lua 5.3.2: update doc/3RDPARTY and add entry to doc/CHANGES To generate a diff of this commit: cvs rdiff -u -r1.1330 -r1.1331 src/doc/3RDPARTY cvs rdiff -u -r1.2164 -r1.2165 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1330 src/doc/3RDPARTY:1.1331 --- src/doc/3RDPARTY:1.1330 Sat May 14 14:46:55 2016 +++ src/doc/3RDPARTY Tue May 24 17:11:14 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1330 2016/05/14 14:46:55 spz Exp $ +# $NetBSD: 3RDPARTY,v 1.1331 2016/05/24 17:11:14 salazar Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -778,7 +778,7 @@ under src/usr.sbin). We don't use tcpd; into inetd. The provided libwrap2netbsd script handles just libwrap. Package: Lua -Version: Lua 5.3.1 +Version: Lua 5.3.2 Current Vers: Lua 5.3.2 Maintainer: PUC Rio Home Page: http://www.lua.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2164 src/doc/CHANGES:1.2165 --- src/doc/CHANGES:1.2164 Sat May 21 07:22:28 2016 +++ src/doc/CHANGES Tue May 24 17:11:14 2016 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2164 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2165 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -251,6 +251,7 @@ Changes from NetBSD 7.0 to NetBSD 8.0: gettext: Upgrade to 0.16.1 [christos 20160112] bind: Import version 9.10.3-P3. [christos 20160119] dhcpcd: Import dhcpcd 6.10.1. [roy 20160120] + lua: Updated to 5.3.2 [lneto 20160128] openssl: Import openssl 1.0.1r [christos 20160130] gdb(1): Updated to 7.10.1. [christos 20160202] elftoolchain: Import FreeBSD-2016-02-19. [christos 20160219]
CVS commit: src/distrib/notes/common
Module Name:src Committed By: salazar Date: Fri Mar 10 04:13:43 UTC 2017 Modified Files: src/distrib/notes/common: main Log Message: add my name to distrib/notes/common/main To generate a diff of this commit: cvs rdiff -u -r1.533 -r1.534 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.533 src/distrib/notes/common/main:1.534 --- src/distrib/notes/common/main:1.533 Wed Nov 9 08:18:56 2016 +++ src/distrib/notes/common/main Fri Mar 10 04:13:43 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.533 2016/11/09 08:18:56 rin Exp $ +.\" $NetBSD: main,v 1.534 2017/03/10 04:13:43 salazar Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -1363,6 +1363,7 @@ If you're one of them, and would like to .It Ta David Sainty Ta Mt dsai...@netbsd.org .It Ta SAITOH Masanobu Ta Mt msai...@netbsd.org .It Ta Kazuki Sakamoto Ta Mt sakam...@netbsd.org +.It Ta Guilherme Salazar Ta Mt sala...@netbsd.org .It Ta Curt Sampson Ta Mt c...@netbsd.org .It Ta Wilfredo Sanchez Ta Mt wsanc...@netbsd.org .It Ta Ty Sarna Ta Mt tsa...@netbsd.org
CVS import: src/external/mit/lua/dist
Module Name:src Committed By: salazar Date: Thu Sep 8 00:01:37 UTC 2016 Update of /cvsroot/src/external/mit/lua/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5173 Log Message: import Lua 5.3.3 Status: Vendor Tag: LUA Release Tags: LUA_5_3_3 C src/external/mit/lua/dist/README C src/external/mit/lua/dist/Makefile C src/external/mit/lua/dist/src/lzio.c C src/external/mit/lua/dist/src/luac.c C src/external/mit/lua/dist/src/lcode.c C src/external/mit/lua/dist/src/luaconf.h C src/external/mit/lua/dist/src/lopcodes.h C src/external/mit/lua/dist/src/lcorolib.c C src/external/mit/lua/dist/src/ldump.c C src/external/mit/lua/dist/src/ldebug.c C src/external/mit/lua/dist/src/lmem.h C src/external/mit/lua/dist/src/ltm.c C src/external/mit/lua/dist/src/lstate.h C src/external/mit/lua/dist/src/lvm.h C src/external/mit/lua/dist/src/loslib.c C src/external/mit/lua/dist/src/lapi.h C src/external/mit/lua/dist/src/ldblib.c C src/external/mit/lua/dist/src/ltm.h C src/external/mit/lua/dist/src/lfunc.h C src/external/mit/lua/dist/src/ldo.c C src/external/mit/lua/dist/src/lcode.h C src/external/mit/lua/dist/src/lctype.c U src/external/mit/lua/dist/src/lua.hpp C src/external/mit/lua/dist/src/ltable.c C src/external/mit/lua/dist/src/lutf8lib.c C src/external/mit/lua/dist/src/lualib.h C src/external/mit/lua/dist/src/lobject.h C src/external/mit/lua/dist/src/llimits.h C src/external/mit/lua/dist/src/lparser.c C src/external/mit/lua/dist/src/llex.h C src/external/mit/lua/dist/src/liolib.c C src/external/mit/lua/dist/src/lparser.h C src/external/mit/lua/dist/src/lgc.h C src/external/mit/lua/dist/src/lgc.c C src/external/mit/lua/dist/src/lvm.c C src/external/mit/lua/dist/src/lauxlib.c C src/external/mit/lua/dist/src/lapi.c C src/external/mit/lua/dist/src/lstrlib.c C src/external/mit/lua/dist/src/lobject.c C src/external/mit/lua/dist/src/lauxlib.h C src/external/mit/lua/dist/src/lfunc.c C src/external/mit/lua/dist/src/lctype.h C src/external/mit/lua/dist/src/lbaselib.c C src/external/mit/lua/dist/src/lmathlib.c C src/external/mit/lua/dist/src/lprefix.h C src/external/mit/lua/dist/src/linit.c C src/external/mit/lua/dist/src/lua.c C src/external/mit/lua/dist/src/lopcodes.c C src/external/mit/lua/dist/src/loadlib.c C src/external/mit/lua/dist/src/ltablib.c C src/external/mit/lua/dist/src/ltable.h C src/external/mit/lua/dist/src/lundump.h C src/external/mit/lua/dist/src/lzio.h C src/external/mit/lua/dist/src/lstring.c C src/external/mit/lua/dist/src/llex.c C src/external/mit/lua/dist/src/lua.h C src/external/mit/lua/dist/src/lmem.c C src/external/mit/lua/dist/src/ldebug.h C src/external/mit/lua/dist/src/lbitlib.c U src/external/mit/lua/dist/src/Makefile C src/external/mit/lua/dist/src/ldo.h C src/external/mit/lua/dist/src/lundump.c C src/external/mit/lua/dist/src/lstring.h C src/external/mit/lua/dist/src/lstate.c C src/external/mit/lua/dist/doc/readme.html C src/external/mit/lua/dist/doc/lua.css U src/external/mit/lua/dist/doc/manual.css C src/external/mit/lua/dist/doc/manual.html U src/external/mit/lua/dist/doc/logo.gif C src/external/mit/lua/dist/doc/lua.1 U src/external/mit/lua/dist/doc/index.css C src/external/mit/lua/dist/doc/contents.html C src/external/mit/lua/dist/doc/luac.1 U src/external/mit/lua/dist/doc/osi-certified-72x60.png 68 conflicts created by this import. Use the following command to help the merge: cvs checkout -jLUA:yesterday -jLUA src/external/mit/lua/dist
CVS import: src/external/mit/lua/dist
Module Name:src Committed By: salazar Date: Thu Sep 8 00:55:18 UTC 2016 Update of /cvsroot/src/external/mit/lua/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24536 Log Message: import Lua 5.3.3 Status: Vendor Tag: LUA Release Tags: LUA_5_3_3 U src/external/mit/lua/dist/README U src/external/mit/lua/dist/Makefile C src/external/mit/lua/dist/src/lzio.c C src/external/mit/lua/dist/src/luac.c C src/external/mit/lua/dist/src/lcode.c C src/external/mit/lua/dist/src/luaconf.h C src/external/mit/lua/dist/src/lopcodes.h C src/external/mit/lua/dist/src/lcorolib.c C src/external/mit/lua/dist/src/ldump.c C src/external/mit/lua/dist/src/ldebug.c C src/external/mit/lua/dist/src/lmem.h C src/external/mit/lua/dist/src/ltm.c C src/external/mit/lua/dist/src/lstate.h C src/external/mit/lua/dist/src/lvm.h C src/external/mit/lua/dist/src/loslib.c C src/external/mit/lua/dist/src/lapi.h C src/external/mit/lua/dist/src/ldblib.c C src/external/mit/lua/dist/src/ltm.h C src/external/mit/lua/dist/src/lfunc.h C src/external/mit/lua/dist/src/ldo.c C src/external/mit/lua/dist/src/lcode.h C src/external/mit/lua/dist/src/lctype.c U src/external/mit/lua/dist/src/lua.hpp C src/external/mit/lua/dist/src/ltable.c C src/external/mit/lua/dist/src/lutf8lib.c C src/external/mit/lua/dist/src/lualib.h C src/external/mit/lua/dist/src/lobject.h C src/external/mit/lua/dist/src/llimits.h C src/external/mit/lua/dist/src/lparser.c C src/external/mit/lua/dist/src/llex.h C src/external/mit/lua/dist/src/liolib.c C src/external/mit/lua/dist/src/lparser.h C src/external/mit/lua/dist/src/lgc.h C src/external/mit/lua/dist/src/lgc.c C src/external/mit/lua/dist/src/lvm.c C src/external/mit/lua/dist/src/lauxlib.c C src/external/mit/lua/dist/src/lapi.c C src/external/mit/lua/dist/src/lstrlib.c C src/external/mit/lua/dist/src/lobject.c C src/external/mit/lua/dist/src/lauxlib.h C src/external/mit/lua/dist/src/lfunc.c C src/external/mit/lua/dist/src/lctype.h C src/external/mit/lua/dist/src/lbaselib.c C src/external/mit/lua/dist/src/lmathlib.c C src/external/mit/lua/dist/src/lprefix.h C src/external/mit/lua/dist/src/linit.c C src/external/mit/lua/dist/src/lua.c C src/external/mit/lua/dist/src/lopcodes.c C src/external/mit/lua/dist/src/loadlib.c C src/external/mit/lua/dist/src/ltablib.c C src/external/mit/lua/dist/src/ltable.h C src/external/mit/lua/dist/src/lundump.h C src/external/mit/lua/dist/src/lzio.h C src/external/mit/lua/dist/src/lstring.c C src/external/mit/lua/dist/src/llex.c C src/external/mit/lua/dist/src/lua.h C src/external/mit/lua/dist/src/lmem.c C src/external/mit/lua/dist/src/ldebug.h C src/external/mit/lua/dist/src/lbitlib.c U src/external/mit/lua/dist/src/Makefile C src/external/mit/lua/dist/src/ldo.h C src/external/mit/lua/dist/src/lundump.c C src/external/mit/lua/dist/src/lstring.h C src/external/mit/lua/dist/src/lstate.c U src/external/mit/lua/dist/doc/readme.html U src/external/mit/lua/dist/doc/lua.css U src/external/mit/lua/dist/doc/manual.css C src/external/mit/lua/dist/doc/manual.html U src/external/mit/lua/dist/doc/logo.gif C src/external/mit/lua/dist/doc/lua.1 U src/external/mit/lua/dist/doc/index.css U src/external/mit/lua/dist/doc/contents.html C src/external/mit/lua/dist/doc/luac.1 U src/external/mit/lua/dist/doc/osi-certified-72x60.png 63 conflicts created by this import. Use the following command to help the merge: cvs checkout -jLUA:yesterday -jLUA src/external/mit/lua/dist
CVS import: src/external/mit/lua/dist
Module Name:src Committed By: salazar Date: Thu Sep 8 01:14:19 UTC 2016 Update of /cvsroot/src/external/mit/lua/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18860 Log Message: import Lua 5.3.3 Status: Vendor Tag: LUA Release Tags: LUA_5_3_3 U src/external/mit/lua/dist/README U src/external/mit/lua/dist/Makefile C src/external/mit/lua/dist/src/lzio.c C src/external/mit/lua/dist/src/luac.c C src/external/mit/lua/dist/src/lcode.c C src/external/mit/lua/dist/src/luaconf.h C src/external/mit/lua/dist/src/lopcodes.h C src/external/mit/lua/dist/src/lcorolib.c C src/external/mit/lua/dist/src/ldump.c C src/external/mit/lua/dist/src/ldebug.c C src/external/mit/lua/dist/src/lmem.h C src/external/mit/lua/dist/src/ltm.c C src/external/mit/lua/dist/src/lstate.h C src/external/mit/lua/dist/src/lvm.h C src/external/mit/lua/dist/src/loslib.c C src/external/mit/lua/dist/src/lapi.h C src/external/mit/lua/dist/src/ldblib.c C src/external/mit/lua/dist/src/ltm.h C src/external/mit/lua/dist/src/lfunc.h C src/external/mit/lua/dist/src/ldo.c C src/external/mit/lua/dist/src/lcode.h C src/external/mit/lua/dist/src/lctype.c U src/external/mit/lua/dist/src/lua.hpp C src/external/mit/lua/dist/src/ltable.c C src/external/mit/lua/dist/src/lutf8lib.c C src/external/mit/lua/dist/src/lualib.h C src/external/mit/lua/dist/src/lobject.h C src/external/mit/lua/dist/src/llimits.h C src/external/mit/lua/dist/src/lparser.c C src/external/mit/lua/dist/src/llex.h C src/external/mit/lua/dist/src/liolib.c C src/external/mit/lua/dist/src/lparser.h C src/external/mit/lua/dist/src/lgc.h C src/external/mit/lua/dist/src/lgc.c C src/external/mit/lua/dist/src/lvm.c C src/external/mit/lua/dist/src/lauxlib.c C src/external/mit/lua/dist/src/lapi.c C src/external/mit/lua/dist/src/lstrlib.c C src/external/mit/lua/dist/src/lobject.c C src/external/mit/lua/dist/src/lauxlib.h C src/external/mit/lua/dist/src/lfunc.c C src/external/mit/lua/dist/src/lctype.h C src/external/mit/lua/dist/src/lbaselib.c C src/external/mit/lua/dist/src/lmathlib.c C src/external/mit/lua/dist/src/lprefix.h C src/external/mit/lua/dist/src/linit.c C src/external/mit/lua/dist/src/lua.c C src/external/mit/lua/dist/src/lopcodes.c C src/external/mit/lua/dist/src/loadlib.c C src/external/mit/lua/dist/src/ltablib.c C src/external/mit/lua/dist/src/ltable.h C src/external/mit/lua/dist/src/lundump.h C src/external/mit/lua/dist/src/lzio.h C src/external/mit/lua/dist/src/lstring.c C src/external/mit/lua/dist/src/llex.c C src/external/mit/lua/dist/src/lua.h C src/external/mit/lua/dist/src/lmem.c C src/external/mit/lua/dist/src/ldebug.h C src/external/mit/lua/dist/src/lbitlib.c U src/external/mit/lua/dist/src/Makefile C src/external/mit/lua/dist/src/ldo.h C src/external/mit/lua/dist/src/lundump.c C src/external/mit/lua/dist/src/lstring.h C src/external/mit/lua/dist/src/lstate.c U src/external/mit/lua/dist/doc/readme.html U src/external/mit/lua/dist/doc/lua.css U src/external/mit/lua/dist/doc/manual.css U src/external/mit/lua/dist/doc/manual.html U src/external/mit/lua/dist/doc/logo.gif C src/external/mit/lua/dist/doc/lua.1 U src/external/mit/lua/dist/doc/index.css U src/external/mit/lua/dist/doc/contents.html C src/external/mit/lua/dist/doc/luac.1 U src/external/mit/lua/dist/doc/osi-certified-72x60.png 62 conflicts created by this import. Use the following command to help the merge: cvs checkout -jLUA:yesterday -jLUA src/external/mit/lua/dist
CVS commit: src/doc
Module Name:src Committed By: salazar Date: Thu Sep 8 02:34:25 UTC 2016 Modified Files: src/doc: 3RDPARTY Log Message: update Lua entry to Lua 5.3.3 To generate a diff of this commit: cvs rdiff -u -r1.1359 -r1.1360 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1359 src/doc/3RDPARTY:1.1360 --- src/doc/3RDPARTY:1.1359 Wed Sep 7 11:33:48 2016 +++ src/doc/3RDPARTY Thu Sep 8 02:34:25 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1359 2016/09/07 11:33:48 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1360 2016/09/08 02:34:25 salazar Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -794,12 +794,12 @@ under src/usr.sbin). We don't use tcpd; into inetd. The provided libwrap2netbsd script handles just libwrap. Package: Lua -Version: Lua 5.3.2 -Current Vers: Lua 5.3.2 +Version: Lua 5.3.3 +Current Vers: Lua 5.3.3 Maintainer: PUC Rio Home Page: http://www.lua.org/ Mailing List: -Responsible: mbalmer, lneto +Responsible: mbalmer, lneto, salazar License: MIT Location: external/mit/lua/dist Notes:
CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: salazar
Date: Thu Sep 8 02:51:53 UTC 2016
Modified Files:
src/external/mit/lua/dist/src: lstrlib.c
Log Message:
fix misplaced kernel Lua ifndef
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/mit/lua/dist/src/lstrlib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/dist/src/lstrlib.c
diff -u src/external/mit/lua/dist/src/lstrlib.c:1.13 src/external/mit/lua/dist/src/lstrlib.c:1.14
--- src/external/mit/lua/dist/src/lstrlib.c:1.13 Thu Sep 8 02:21:31 2016
+++ src/external/mit/lua/dist/src/lstrlib.c Thu Sep 8 02:51:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lstrlib.c,v 1.13 2016/09/08 02:21:31 salazar Exp $ */
+/* $NetBSD: lstrlib.c,v 1.14 2016/09/08 02:51:53 salazar Exp $ */
/*
** Id: lstrlib.c,v 1.251 2016/05/20 14:13:21 roberto Exp
@@ -956,22 +956,20 @@ static void addliteral (lua_State *L, lu
case LUA_TNUMBER: {
char *buff = luaL_prepbuffsize(b, MAX_ITEM);
int nb;
-#ifndef _KERNEL
if (!lua_isinteger(L, arg)) { /* float? */
+#ifndef _KERNEL
lua_Number n = lua_tonumber(L, arg); /* write as hexa ('%a') */
nb = lua_number2strx(L, buff, MAX_ITEM, "%" LUA_NUMBER_FRMLEN "a", n);
checkdp(buff, nb); /* ensure it uses a dot */
+#endif
}
else { /* integers */
-#else
- {
lua_Integer n = lua_tointeger(L, arg);
const char *format = (n == LUA_MININTEGER) /* corner case? */
? "0x%" LUA_INTEGER_FRMLEN "x" /* use hexa */
: LUA_INTEGER_FMT; /* else use default format */
nb = l_sprintf(buff, MAX_ITEM, format, n);
}
-#endif
luaL_addsize(b, nb);
break;
}
CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: salazar
Date: Thu Sep 8 02:53:39 UTC 2016
Modified Files:
src/external/mit/lua/dist/src: lparser.c
Log Message:
fix bug 1 reported on www.lua.org/bugs.html
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/src/lparser.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/dist/src/lparser.c
diff -u src/external/mit/lua/dist/src/lparser.c:1.6 src/external/mit/lua/dist/src/lparser.c:1.7
--- src/external/mit/lua/dist/src/lparser.c:1.6 Thu Sep 8 02:21:31 2016
+++ src/external/mit/lua/dist/src/lparser.c Thu Sep 8 02:53:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lparser.c,v 1.6 2016/09/08 02:21:31 salazar Exp $ */
+/* $NetBSD: lparser.c,v 1.7 2016/09/08 02:53:39 salazar Exp $ */
/*
** Id: lparser.c,v 2.153 2016/05/13 19:10:16 roberto Exp
@@ -327,6 +327,8 @@ static void adjust_assign (LexState *ls,
luaK_nil(fs, reg, extra);
}
}
+ if (nexps > nvars)
+ls->fs->freereg -= nexps - nvars; /* remove extra values */
}
@@ -1174,11 +1176,8 @@ static void assignment (LexState *ls, st
int nexps;
checknext(ls, '=');
nexps = explist(ls, &e);
-if (nexps != nvars) {
+if (nexps != nvars)
adjust_assign(ls, nvars, nexps, &e);
- if (nexps > nvars)
-ls->fs->freereg -= nexps - nvars; /* remove extra values */
-}
else {
luaK_setoneret(ls->fs, &e); /* close last expression */
luaK_storevar(ls->fs, &lh->v, &e);
CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: salazar
Date: Thu Sep 8 02:55:50 UTC 2016
Modified Files:
src/external/mit/lua/dist/src: loslib.c
Log Message:
fix bug 2 (for Lua.5.3.3) reported on www.lua.org/bugs.html
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/src/loslib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/dist/src/loslib.c
diff -u src/external/mit/lua/dist/src/loslib.c:1.6 src/external/mit/lua/dist/src/loslib.c:1.7
--- src/external/mit/lua/dist/src/loslib.c:1.6 Thu Sep 8 02:21:31 2016
+++ src/external/mit/lua/dist/src/loslib.c Thu Sep 8 02:55:50 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: loslib.c,v 1.6 2016/09/08 02:21:31 salazar Exp $ */
+/* $NetBSD: loslib.c,v 1.7 2016/09/08 02:55:50 salazar Exp $ */
/*
** Id: loslib.c,v 1.64 2016/04/18 13:06:55 roberto Exp
@@ -262,8 +262,9 @@ static int getfield (lua_State *L, const
static const char *checkoption (lua_State *L, const char *conv, char *buff) {
const char *option;
int oplen = 1;
- for (option = LUA_STRFTIMEOPTIONS; *option != '\0'; option += oplen) {
-if (*option == '|') /* next block? */
+ int convlen = (int)strlen(conv);
+ for (option = LUA_STRFTIMEOPTIONS; *option != '\0' && oplen <= convlen; option += oplen) {
+ if (*option == '|') /* next block? */
oplen++; /* next length */
else if (memcmp(conv, option, oplen) == 0) { /* match? */
memcpy(buff, conv, oplen); /* copy valid option to buffer */
CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: salazar
Date: Thu Sep 8 02:57:32 UTC 2016
Modified Files:
src/external/mit/lua/dist/src: lcode.c
Log Message:
fix bug 3 (for Lua.5.3.3) reported on www.lua.org/bugs.html
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/src/lcode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/dist/src/lcode.c
diff -u src/external/mit/lua/dist/src/lcode.c:1.6 src/external/mit/lua/dist/src/lcode.c:1.7
--- src/external/mit/lua/dist/src/lcode.c:1.6 Thu Sep 8 02:21:31 2016
+++ src/external/mit/lua/dist/src/lcode.c Thu Sep 8 02:57:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lcode.c,v 1.6 2016/09/08 02:21:31 salazar Exp $ */
+/* $NetBSD: lcode.c,v 1.7 2016/09/08 02:57:32 salazar Exp $ */
/*
** Id: lcode.c,v 2.109 2016/05/13 19:09:21 roberto Exp
@@ -1046,8 +1046,8 @@ static void codeunexpval (FuncState *fs,
*/
static void codebinexpval (FuncState *fs, OpCode op,
expdesc *e1, expdesc *e2, int line) {
- int rk1 = luaK_exp2RK(fs, e1); /* both operands are "RK" */
- int rk2 = luaK_exp2RK(fs, e2);
+ int rk2 = luaK_exp2RK(fs, e2); /* both operands are "RK" */
+ int rk1 = luaK_exp2RK(fs, e1);
freeexps(fs, e1, e2);
e1->u.info = luaK_codeABC(fs, op, 0, rk1, rk2); /* generate opcode */
e1->k = VRELOCABLE; /* all those operations are relocatable */
CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: salazar
Date: Thu Sep 8 20:57:20 UTC 2016
Modified Files:
src/external/mit/lua/dist/src: lcode.c llex.c lstrlib.c
Log Message:
fix kernel Lua code style issues
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/lua/dist/src/lcode.c
cvs rdiff -u -r1.8 -r1.9 src/external/mit/lua/dist/src/llex.c
cvs rdiff -u -r1.14 -r1.15 src/external/mit/lua/dist/src/lstrlib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/dist/src/lcode.c
diff -u src/external/mit/lua/dist/src/lcode.c:1.7 src/external/mit/lua/dist/src/lcode.c:1.8
--- src/external/mit/lua/dist/src/lcode.c:1.7 Thu Sep 8 02:57:32 2016
+++ src/external/mit/lua/dist/src/lcode.c Thu Sep 8 20:57:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lcode.c,v 1.7 2016/09/08 02:57:32 salazar Exp $ */
+/* $NetBSD: lcode.c,v 1.8 2016/09/08 20:57:20 salazar Exp $ */
/*
** Id: lcode.c,v 2.109 2016/05/13 19:09:21 roberto Exp
@@ -775,7 +775,7 @@ int luaK_exp2RK (FuncState *fs, expdesc
case VKINT: e->u.info = luaK_intK(fs, e->u.ival); goto vk;
#ifndef _KERNEL
case VKFLT: e->u.info = luaK_numberK(fs, e->u.nval); goto vk;
-#endif
+#endif /* _KERNEL */
case VK:
vk:
e->k = VK;
Index: src/external/mit/lua/dist/src/llex.c
diff -u src/external/mit/lua/dist/src/llex.c:1.8 src/external/mit/lua/dist/src/llex.c:1.9
--- src/external/mit/lua/dist/src/llex.c:1.8 Thu Sep 8 02:21:31 2016
+++ src/external/mit/lua/dist/src/llex.c Thu Sep 8 20:57:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: llex.c,v 1.8 2016/09/08 02:21:31 salazar Exp $ */
+/* $NetBSD: llex.c,v 1.9 2016/09/08 20:57:20 salazar Exp $ */
/*
** Id: llex.c,v 2.96 2016/05/02 14:02:12 roberto Exp
@@ -213,6 +213,7 @@ static int check_next2 (LexState *ls, co
else return 0;
}
+
#ifndef _KERNEL
/* LUA_NUMBER */
/*
Index: src/external/mit/lua/dist/src/lstrlib.c
diff -u src/external/mit/lua/dist/src/lstrlib.c:1.14 src/external/mit/lua/dist/src/lstrlib.c:1.15
--- src/external/mit/lua/dist/src/lstrlib.c:1.14 Thu Sep 8 02:51:53 2016
+++ src/external/mit/lua/dist/src/lstrlib.c Thu Sep 8 20:57:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lstrlib.c,v 1.14 2016/09/08 02:51:53 salazar Exp $ */
+/* $NetBSD: lstrlib.c,v 1.15 2016/09/08 20:57:20 salazar Exp $ */
/*
** Id: lstrlib.c,v 1.251 2016/05/20 14:13:21 roberto Exp
@@ -942,7 +942,7 @@ static void checkdp (char *buff, int nb)
if (ppoint) *ppoint = '.'; /* change it to a dot */
}
}
-#endif
+#endif /* _KERNEL */
static void addliteral (lua_State *L, luaL_Buffer *b, int arg) {
@@ -961,7 +961,7 @@ static void addliteral (lua_State *L, lu
lua_Number n = lua_tonumber(L, arg); /* write as hexa ('%a') */
nb = lua_number2strx(L, buff, MAX_ITEM, "%" LUA_NUMBER_FRMLEN "a", n);
checkdp(buff, nb); /* ensure it uses a dot */
-#endif
+#endif /* _KERNEL */
}
else { /* integers */
lua_Integer n = lua_tointeger(L, arg);
CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: salazar
Date: Thu Sep 8 21:19:44 UTC 2016
Modified Files:
src/external/mit/lua/dist/src: loslib.c
Log Message:
fix code style issue
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/lua/dist/src/loslib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/dist/src/loslib.c
diff -u src/external/mit/lua/dist/src/loslib.c:1.7 src/external/mit/lua/dist/src/loslib.c:1.8
--- src/external/mit/lua/dist/src/loslib.c:1.7 Thu Sep 8 02:55:50 2016
+++ src/external/mit/lua/dist/src/loslib.c Thu Sep 8 21:19:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: loslib.c,v 1.7 2016/09/08 02:55:50 salazar Exp $ */
+/* $NetBSD: loslib.c,v 1.8 2016/09/08 21:19:44 salazar Exp $ */
/*
** Id: loslib.c,v 1.64 2016/04/18 13:06:55 roberto Exp
@@ -264,7 +264,7 @@ static const char *checkoption (lua_Stat
int oplen = 1;
int convlen = (int)strlen(conv);
for (option = LUA_STRFTIMEOPTIONS; *option != '\0' && oplen <= convlen; option += oplen) {
- if (*option == '|') /* next block? */
+if (*option == '|') /* next block? */
oplen++; /* next length */
else if (memcmp(conv, option, oplen) == 0) { /* match? */
memcpy(buff, conv, oplen); /* copy valid option to buffer */
CVS commit: src/doc
Module Name:src Committed By: salazar Date: Thu Sep 8 21:33:56 UTC 2016 Modified Files: src/doc: CHANGES Log Message: add lua 5.3.3 entry To generate a diff of this commit: cvs rdiff -u -r1.2183 -r1.2184 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2183 src/doc/CHANGES:1.2184 --- src/doc/CHANGES:1.2183 Wed Aug 31 09:34:04 2016 +++ src/doc/CHANGES Thu Sep 8 21:33:56 2016 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2183 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2184 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -350,3 +350,5 @@ Changes from NetBSD 7.0 to NetBSD 8.0: dhcpcd(8): Import dhcpcd-6.11.3. [roy 20160815] unbound: Import 1.5.9. [christos 20160820] tmux(1): Import of tmux 2.2 [christos 20160831] + lua: updated to 5.3.3 and applied all three patches from + http://lua.org/bugs.html [salazar 20160908]
