[Date Prev][Date Next][Thread Prev][Thread Next]
[Date Index]
[Thread Index]
- Subject: Re: Unable to download patches from http://lua-users.org/wiki/LuaPowerPatches
- From: Gabriel Bertilson <arboreous.philologist@...>
- Date: Mon, 13 May 2019 11:58:59 -0500
If you are interested in particular ones, here are the "advanced
readline" and "named library" patches for Lua 5.3.1 and Lua 5.3.4
respectively, originally downloaded from the lua-users wiki.
— Gabriel
— Gabriel
On Mon, May 13, 2019 at 6:50 AM Bogdan Marinescu
<bogdan.marinescu@gmail.com> wrote:
>
> Any news on this? Am I to understand that those patches are lost forever? Surely that can't be right.
>
> On Wed, May 8, 2019 at 4:30 PM Bogdan Marinescu <bogdan.marinescu@gmail.com> wrote:
>>
>> Thanks, but unfortunately that doesn't work either: https://web.archive.org/web/*/http://lua-users.org/files/wiki_insecure/power_patches/5.3/*
>>
>> On Wed, May 8, 2019 at 4:18 PM Ką Mykolas <kamicc@gmail.com> wrote:
>>>
>>> For quick reference, it's still available on WebArchives: https://web.archive.org/web/20160712114727/http://lua-users.org/wiki/LuaPowerPatches
>>>
>>> On Wed, May 8, 2019 at 4:15 PM Ką Mykolas <kamicc@gmail.com> wrote:
>>>>
>>>> mhm. The whole directory seems to be missing: http://lua-users.org/files/wiki_insecure/power_patches
>>>>
>>>> On Wed, May 8, 2019 at 3:55 PM Bogdan Marinescu <bogdan.marinescu@gmail.com> wrote:
>>>>>
>>>>> Hi,
>>>>>
>>>>> I'm trying to download some patches for Lua 5.3 from http://lua-users.org/wiki/LuaPowerPatches, but it seems that the ones hosted on lua-users.org can't be dowloaded (404 errors). Some examples (there are more):
>>>>>
>>>>> - http://lua-users.org/files/wiki_insecure/power_patches/5.3/lua-5.3.4-named-library.patch from "Preload libraries with customized global names (5.3.4)"
>>>>> - http://lua-users.org/files/wiki_insecure/power_patches/5.3/NoFlua-5.3.3.patch from "No Floating-Point Option (5.3)"
>>>>>
>>>>> Is this a known issue?
>>>>>
>>>>> Thanks,
>>>>> Bogdan
>>>>>
diff -ur lua-5.3.1/src/lua.c lua-5.3.1-patched/src/lua.c
--- lua-5.3.1/src/lua.c 2015-03-30 08:42:59.000000000 -0700
+++ lua-5.3.1-patched/src/lua.c 2015-06-17 16:17:29.132908211 -0700
@@ -264,6 +264,264 @@
return report(L, status);
}
+/* ------------------------------------------------------------------------ */
+
+#ifdef LUA_USE_READLINE
+/*
+** Lua 5.2.0 advanced readline support for the GNU readline and history
+** libraries or compatible replacements.
+**
+** Author: Mike Pall.
+** Maintainer: Sean Bolton (sean at smbolton dot com).
+**
+** Copyright (C) 2004-2006, 2014 Mike Pall. Same license as Lua. See lua.h.
+**
+** Advanced features:
+** - Completion of keywords and global variable names.
+** - Recursive and metatable-aware completion of variable names.
+** - Context sensitive delimiter completion.
+** - Save/restore of the history to/from a file (LUA_HISTORY env variable).
+** - Setting a limit for the size of the history (LUA_HISTSIZE env variable).
+** - Setting the app name to allow for $if lua ... $endif in ~/.inputrc.
+**
+** Start lua and try these (replace ~ with the TAB key):
+**
+** ~~
+** fu~foo() ret~fa~end<CR>
+** io~~~s~~~o~~~w~"foo\n")<CR>
+**
+** The ~~ are just for demonstration purposes (io~s~o~w~ suffices, of course).
+**
+** If you are used to zsh/tcsh-style completion support, try adding
+** 'TAB: menu-complete' and 'C-d: possible-completions' to your ~/.inputrc.
+**
+** The patch has been successfully tested with:
+**
+** GNU readline 2.2.1 (1998-07-17)
+** GNU readline 4.0 (1999-02-18) [harmless compiler warning]
+** GNU readline 4.3 (2002-07-16)
+** GNU readline 5.0 (2004-07-27)
+** GNU readline 5.1 (2005-12-07)
+** GNU readline 5.2 (2006-10-11)
+** GNU readline 6.0 (2009-02-20)
+** GNU readline 6.2 (2011-02-13)
+** MacOSX libedit 2.11 (2008-07-12)
+** NETBSD libedit 2.6.5 (2002-03-25)
+** NETBSD libedit 2.6.9 (2004-05-01)
+**
+** Change Log:
+** 2004-2006 Mike Pall - original patch
+** 2009/08/24 Sean Bolton - updated for GNU readline version 6
+** 2011/11/15 Sean Bolton - updated for Lua 5.2
+** 2011/12/14 Sean Bolton - fixed segfault when using Mac OS X libedit 2.11
+** 2014/08/07 Sean Bolton - updated for Lua 5.3.0-alpha
+** 2015/06/17 Sean Bolton - updated for Lua 5.3.1
+*/
+
+#include <ctype.h>
+
+static char *lua_rl_hist;
+static int lua_rl_histsize;
+
+static lua_State *lua_rl_L; /* User data is not passed to rl callbacks. */
+
+/* Reserved keywords. */
+static const char *const lua_rl_keywords[] = {
+ "and", "break", "do", "else", "elseif", "end", "false",
+ "for", "function", "goto", "if", "in", "local", "nil", "not", "or",
+ "repeat", "return", "then", "true", "until", "while", NULL
+};
+
+static int valididentifier(const char *s)
+{
+ if (!(isalpha(*s) || *s == '_')) return 0;
+ for (s++; *s; s++) if (!(isalpha(*s) || isdigit(*s) || *s == '_')) return 0;
+ return 1;
+}
+
+/* Dynamically resizable match list. */
+typedef struct {
+ char **list;
+ size_t idx, allocated, matchlen;
+} dmlist;
+
+/* Add prefix + string + suffix to list and compute common prefix. */
+static int lua_rl_dmadd(dmlist *ml, const char *p, size_t pn, const char *s,
+ int suf)
+{
+ char *t = NULL;
+
+ if (ml->idx+1 >= ml->allocated &&
+ !(ml->list = realloc(ml->list, sizeof(char *)*(ml->allocated += 32))))
+ return -1;
+
+ if (s) {
+ size_t n = strlen(s);
+ if (!(t = (char *)malloc(sizeof(char)*(pn+n+(suf?2:1))))) return 1;
+ memcpy(t, p, pn);
+ memcpy(t+pn, s, n);
+ n += pn;
+ t[n] = suf;
+ if (suf) t[++n] = '\0';
+
+ if (ml->idx == 0) {
+ ml->matchlen = n;
+ } else {
+ size_t i;
+ for (i = 0; i < ml->matchlen && i < n && ml->list[1][i] == t[i]; i++) ;
+ ml->matchlen = i; /* Set matchlen to common prefix. */
+ }
+ }
+
+ ml->list[++ml->idx] = t;
+ return 0;
+}
+
+/* Get __index field of metatable of object on top of stack. */
+static int lua_rl_getmetaindex(lua_State *L)
+{
+ if (!lua_getmetatable(L, -1)) { lua_pop(L, 1); return 0; }
+ lua_pushstring(L, "__index");
+ lua_rawget(L, -2);
+ lua_replace(L, -2);
+ if (lua_isnil(L, -1) || lua_rawequal(L, -1, -2)) { lua_pop(L, 2); return 0; }
+ lua_replace(L, -2);
+ return 1;
+} /* 1: obj -- val, 0: obj -- */
+
+/* Get field from object on top of stack. Avoid calling metamethods. */
+static int lua_rl_getfield(lua_State *L, const char *s, size_t n)
+{
+ int i = 20; /* Avoid infinite metatable loops. */
+ do {
+ if (lua_istable(L, -1)) {
+ lua_pushlstring(L, s, n);
+ lua_rawget(L, -2);
+ if (!lua_isnil(L, -1)) { lua_replace(L, -2); return 1; }
+ lua_pop(L, 1);
+ }
+ } while (--i > 0 && lua_rl_getmetaindex(L));
+ lua_pop(L, 1);
+ return 0;
+} /* 1: obj -- val, 0: obj -- */
+
+/* Completion callback. */
+static char **lua_rl_complete(const char *text, int start, int end)
+{
+ lua_State *L = lua_rl_L;
+ dmlist ml;
+ const char *s;
+ size_t i, n, dot, loop;
+ int savetop;
+
+ if (!(text[0] == '\0' || isalpha(text[0]) || text[0] == '_')) return NULL;
+
+ ml.list = NULL;
+ ml.idx = ml.allocated = ml.matchlen = 0;
+
+ savetop = lua_gettop(L);
+ lua_pushglobaltable(L);
+ for (n = (size_t)(end-start), i = dot = 0; i < n; i++)
+ if (text[i] == '.' || text[i] == ':') {
+ if (!lua_rl_getfield(L, text+dot, i-dot))
+ goto error; /* Invalid prefix. */
+ dot = i+1; /* Points to first char after dot/colon. */
+ }
+
+ /* Add all matches against keywords if there is no dot/colon. */
+ if (dot == 0)
+ for (i = 0; (s = lua_rl_keywords[i]) != NULL; i++)
+ if (!strncmp(s, text, n) && lua_rl_dmadd(&ml, NULL, 0, s, ' '))
+ goto error;
+
+ /* Add all valid matches from all tables/metatables. */
+ loop = 0; /* Avoid infinite metatable loops. */
+ lua_pushglobaltable(L);
+ lua_insert(L, -2);
+ do {
+ if (lua_istable(L, -1) &&
+ (loop == 0 || !lua_rawequal(L, -1, -2)))
+ for (lua_pushnil(L); lua_next(L, -2); lua_pop(L, 1))
+ if (lua_type(L, -2) == LUA_TSTRING) {
+ s = lua_tostring(L, -2);
+ /* Only match names starting with '_' if explicitly requested. */
+ if (!strncmp(s, text+dot, n-dot) && valididentifier(s) &&
+ (*s != '_' || text[dot] == '_')) {
+ int suf = ' '; /* Default suffix is a space. */
+ switch (lua_type(L, -1)) {
+ case LUA_TTABLE: suf = '.'; break; /* No way to guess ':'. */
+ case LUA_TFUNCTION: suf = '('; break;
+ case LUA_TUSERDATA:
+ if (lua_getmetatable(L, -1)) { lua_pop(L, 1); suf = ':'; }
+ break;
+ }
+ if (lua_rl_dmadd(&ml, text, dot, s, suf)) goto error;
+ }
+ }
+ } while (++loop < 20 && lua_rl_getmetaindex(L));
+ lua_pop(L, 1);
+
+ if (ml.idx == 0) {
+error:
+ lua_settop(L, savetop);
+ return NULL;
+ } else {
+ /* list[0] holds the common prefix of all matches (may be ""). */
+ /* If there is only one match, list[0] and list[1] will be the same. */
+ if (!(ml.list[0] = (char *)malloc(sizeof(char)*(ml.matchlen+1))))
+ goto error;
+ memcpy(ml.list[0], ml.list[1], ml.matchlen);
+ ml.list[0][ml.matchlen] = '\0';
+ /* Add the NULL list terminator. */
+ if (lua_rl_dmadd(&ml, NULL, 0, NULL, 0)) goto error;
+ }
+
+ lua_settop(L, savetop);
+#if RL_READLINE_VERSION >= 0x0600
+ rl_completion_suppress_append = 1;
+#endif
+ return ml.list;
+}
+
+/* Initialize readline library. */
+static void lua_rl_init(lua_State *L)
+{
+ char *s;
+
+ lua_rl_L = L;
+
+ /* This allows for $if lua ... $endif in ~/.inputrc. */
+ rl_readline_name = "lua";
+ /* Break words at every non-identifier character except '.' and ':'. */
+ rl_completer_word_break_characters =
+ "\t\r\n !\"#$%&'()*+,-/;<=>?@[\\]^`{|}~";
+ rl_completer_quote_characters = "\"'";
+#if RL_READLINE_VERSION < 0x0600
+ rl_completion_append_character = '\0';
+#endif
+ rl_attempted_completion_function = lua_rl_complete;
+ rl_initialize();
+
+ /* Start using history, optionally set history size and load history file. */
+ using_history();
+ if ((s = getenv("LUA_HISTSIZE")) &&
+ (lua_rl_histsize = atoi(s))) stifle_history(lua_rl_histsize);
+ if ((lua_rl_hist = getenv("LUA_HISTORY"))) read_history(lua_rl_hist);
+}
+
+/* Finalize readline library. */
+static void lua_rl_exit(lua_State *L)
+{
+ (void)L; /* Avoid 'unused parameter' warning. */
+ /* Optionally save history file. */
+ if (lua_rl_hist) write_history(lua_rl_hist);
+}
+#else
+#define lua_rl_init(L) ((void)L)
+#define lua_rl_exit(L) ((void)L)
+#endif
+
+/* ------------------------------------------------------------------------ */
/*
** Returns the string to be used as a prompt by the interpreter.
@@ -408,6 +666,7 @@
int status;
const char *oldprogname = progname;
progname = NULL; /* no 'progname' on errors in interactive mode */
+ lua_rl_init(L);
while ((status = loadline(L)) != -1) {
if (status == LUA_OK)
status = docall(L, 0, LUA_MULTRET);
@@ -416,6 +675,7 @@
}
lua_settop(L, 0); /* clear stack */
lua_writeline();
+ lua_rl_exit(L);
progname = oldprogname;
}
--- lua-5.3.4/src/lua.c 2017-01-12 19:14:26.000000000 +0200
+++ /usr/local/src/lua-5.3.4/src/lua.c 2017-04-20 09:56:45.934110199 +0200
@@ -256,13 +256,18 @@
** Calls 'require(name)' and stores the result in a global variable
** with the given name.
*/
-static int dolibrary (lua_State *L, const char *name) {
+static int dolibrary (lua_State *L, char *name) {
int status;
- lua_getglobal(L, "require");
- lua_pushstring(L, name);
+ char *eq = strchr(name,'=');
+ lua_getglobal(L, "require");
+ if (eq) lua_pushstring(L, eq+1);
+ else lua_pushstring(L, name);
status = docall(L, 1, 1); /* call 'require(name)' */
- if (status == LUA_OK)
+ if (status == LUA_OK) {
+ if (eq) *eq=0;
lua_setglobal(L, name); /* global[name] = require return */
+ if (eq) *eq='=';
+ }
return report(L, status);
}
