summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/lua/luainit.w
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/lua/luainit.w')
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/luainit.w178
1 files changed, 85 insertions, 93 deletions
diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.w b/Build/source/texk/web2c/luatexdir/lua/luainit.w
index 11b2883b113..7205b801682 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luainit.w
+++ b/Build/source/texk/web2c/luatexdir/lua/luainit.w
@@ -1,32 +1,33 @@
% luainit.w
-%
-% Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
-
+%
+% Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
+%
% This file is part of LuaTeX.
-
+%
% LuaTeX is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free
% Software Foundation; either version 2 of the License, or (at your
% option) any later version.
-
+%
% LuaTeX is distributed in the hope that it will be useful, but WITHOUT
% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
% FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
% License for more details.
-
+%
% You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
@ @c
+static const char _svn_version[] =
+ "$Id: luainit.w 4524 2012-12-20 15:38:02Z taco $"
+ "$URL: http://foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/lua/luainit.w $";
+
#include <kpathsea/c-stat.h>
#include "ptexlib.h"
#include "lua/luatex-api.h"
-static const char _svn_version[] =
- "$Id: luainit.w 4260 2011-05-13 07:03:44Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.70.x/source/texk/web2c/luatexdir/lua/luainit.w $";
-
-@
+@
TH: TODO
This file is getting a bit messy, but it is not simple to fix unilaterally.
@@ -132,7 +133,7 @@ static char *ex_selfdir(char *argv0)
FATAL1("This path points to an invalid file : %s\n", short_path);
}
#endif /* __MINGW32__ */
- return xdirname(path);
+ return xdirname(path);
#else /* WIN32 */
return kpse_selfdir(argv0);
#endif
@@ -140,14 +141,14 @@ static char *ex_selfdir(char *argv0)
@ @c
static void
-prepare_cmdline(lua_State * L, char **argv, int argc, int zero_offset)
+prepare_cmdline(lua_State * L, char **av, int ac, int zero_offset)
{
int i;
char *s;
- luaL_checkstack(L, argc + 3, "too many arguments to script");
+ luaL_checkstack(L, ac + 3, "too many arguments to script");
lua_createtable(L, 0, 0);
- for (i = 0; i < argc; i++) {
- lua_pushstring(L, argv[i]);
+ for (i = 0; i < ac; i++) {
+ lua_pushstring(L, av[i]);
lua_rawseti(L, -2, (i - zero_offset));
}
lua_setglobal(L, "arg");
@@ -226,7 +227,7 @@ static struct option long_options[]
};
@ @c
-static void parse_options(int argc, char **argv)
+static void parse_options(int ac, char **av)
{
#ifdef WIN32
/* save argc and argv */
@@ -243,7 +244,7 @@ static void parse_options(int argc, char **argv)
luainit = 1;
}
for (;;) {
- g = getopt_long_only(argc, argv, "+", long_options, &option_index);
+ g = getopt_long_only(ac, av, "+", long_options, &option_index);
if (g == -1) /* End of arguments, exit the loop. */
break;
@@ -344,7 +345,7 @@ static void parse_options(int argc, char **argv)
"the terms of the GNU General Public License, version 2. For more\n"
"information about these matters, see the file named COPYING and\n"
"the LuaTeX source.\n\n"
- "Copyright 2012 Taco Hoekwater, the LuaTeX Team.\n");
+ "Copyright 2011 Taco Hoekwater, the LuaTeX Team.\n");
/* *INDENT-ON* */
uexit(0);
} else if (ARGUMENT_IS("credits")) {
@@ -363,7 +364,7 @@ static void parse_options(int argc, char **argv)
"lua by Roberto Ierusalimschy, Waldemar Celes,\n"
" Luiz Henrique de Figueiredo\n"
"metapost by John Hobby, Taco Hoekwater and friends.\n"
- "poppler by Derek Noonburg, Kristian H\\ogsberg (partial)\n"
+ "poppler by Derek Noonburg, Kristian H\\ogsberg (partial)\n"
"fontforge by George Williams (partial)\n\n"
"Some extensions to lua and additional lua libraries are used, as well as\n"
"libraries for graphic inclusion. More details can be found in the source.\n"
@@ -580,7 +581,6 @@ function, the other for its environment .
@c
static int lua_loader_function = 0;
-static int lua_loader_env = 0;
static int luatex_kpse_lua_find(lua_State * L)
{
@@ -588,13 +588,10 @@ static int luatex_kpse_lua_find(lua_State * L)
const char *name;
name = luaL_checkstring(L, 1);
if (program_name_set == 0) {
- lua_CFunction orig_func;
lua_rawgeti(L, LUA_REGISTRYINDEX, lua_loader_function);
- lua_rawgeti(L, LUA_REGISTRYINDEX, lua_loader_env);
- lua_replace(L, LUA_ENVIRONINDEX);
- orig_func = lua_tocfunction(L, -1);
- lua_pop(L, 1);
- return (orig_func) (L);
+ lua_pushvalue(L, -2);
+ lua_call(L, 1, 1);
+ return 1;
}
filename = luatex_kpse_find_aux(L, name, kpse_lua_format, "lua");
if (filename == NULL)
@@ -608,7 +605,7 @@ static int luatex_kpse_lua_find(lua_State * L)
@ @c
static int clua_loader_function = 0;
-static int clua_loader_env = 0;
+extern int searcher_C_luatex (lua_State *L, const char *name, const char *filename);
static int luatex_kpse_clua_find(lua_State * L)
{
@@ -620,86 +617,73 @@ static int luatex_kpse_clua_find(lua_State * L)
}
name = luaL_checkstring(L, 1);
if (program_name_set == 0) {
- lua_CFunction orig_func;
lua_rawgeti(L, LUA_REGISTRYINDEX, clua_loader_function);
- lua_rawgeti(L, LUA_REGISTRYINDEX, clua_loader_env);
- lua_replace(L, LUA_ENVIRONINDEX);
- orig_func = lua_tocfunction(L, -1);
- lua_pop(L, 1);
- return (orig_func) (L);
- }
- filename = luatex_kpse_find_aux(L, name, kpse_clua_format, "C");
- if (filename == NULL)
- return 1; /* library not found in this path */
- return loader_C_luatex(L, name, filename);
-}
-
-@ @c
-static int clua_loadall_function = 0;
-static int clua_loadall_env = 0;
-
-static int luatex_kpse_cluaall_find(lua_State * L)
-{
- const char *filename;
- const char *name;
- char *fixedname;
- const char *p = NULL;
- if (safer_option) {
- lua_pushliteral(L, "\n\t[All-in-one searcher disabled in safer mode]");
- return 1; /* library not found in this path */
- }
- name = luaL_checkstring(L, 1);
- p = strchr(name, '.');
- if (program_name_set == 0) {
- lua_CFunction orig_func;
- lua_rawgeti(L, LUA_REGISTRYINDEX, clua_loadall_function);
- lua_rawgeti(L, LUA_REGISTRYINDEX, clua_loadall_env);
- lua_replace(L, LUA_ENVIRONINDEX);
- orig_func = lua_tocfunction(L, -1);
- lua_pop(L, 1);
- return (orig_func) (L);
+ lua_pushvalue(L, -2);
+ lua_call(L, 1, 1);
+ return 1;
+ } else {
+ const char *path_saved;
+ char *prefix, *postfix, *p, *total;
+ char *extensionless;
+ filename = luatex_kpse_find_aux(L, name, kpse_clua_format, "C");
+ if (filename == NULL)
+ return 1; /* library not found in this path */
+ extensionless = strdup(filename);
+ if (!extensionless) return 1; /* allocation failure */
+ p = strstr(extensionless, name);
+ if (!p) return 1; /* this would be exceedingly weird */
+ *p = '\0';
+ prefix = strdup(extensionless);
+ if (!prefix) return 1; /* allocation failure */
+ postfix = strdup(p+strlen(name));
+ if (!postfix) return 1; /* allocation failure */
+ total = malloc(strlen(prefix)+strlen(postfix)+2);
+ if (!total) return 1; /* allocation failure */
+ snprintf(total,strlen(prefix)+strlen(postfix)+2, "%s?%s", prefix, postfix);
+ /* save package.path */
+ lua_getglobal(L,"package");
+ lua_getfield(L,-1,"cpath");
+ path_saved = lua_tostring(L,-1);
+ lua_pop(L,1);
+ /* set package.path = "?" */
+ lua_pushstring(L,total);
+ lua_setfield(L,-2,"cpath");
+ lua_pop(L,1); /* pop "package" */
+ /* run function */
+ lua_rawgeti(L, LUA_REGISTRYINDEX, clua_loader_function);
+ lua_pushstring(L, name);
+ lua_call(L, 1, 1);
+ /* restore package.path */
+ lua_getglobal(L,"package");
+ lua_pushstring(L,path_saved);
+ lua_setfield(L,-2,"cpath");
+ lua_pop(L,1); /* pop "package" */
+ free(extensionless);
+ free(total);
+ return 1;
}
- if (p == NULL) return 0; /* is root */
- fixedname = xmalloc((size_t)(p - name)+1);
- memcpy(fixedname,name,(size_t)(p - name));
- fixedname[(p - name)] = '\0';
- filename = luatex_kpse_find_aux(L, fixedname, kpse_clua_format, "All-in-one");
- free(fixedname);
- if (filename == NULL)
- return 1; /* library not found in this path */
- return loader_Call_luatex(L, name, filename);
}
@ Setting up the new search functions.
- This replaces package.loaders[2] with the function defined above.
+This replaces package.searchers[2] and package.searchers[3] with the
+functions defined above.
@c
static void setup_lua_path(lua_State * L)
{
lua_getglobal(L, "package");
- lua_getfield(L, -1, "loaders");
- lua_rawgeti(L, -1, 2); /* package.loaders[2] */
- lua_getfenv(L, -1);
- lua_loader_env = luaL_ref(L, LUA_REGISTRYINDEX);
+ lua_getfield(L, -1, "searchers");
+ lua_rawgeti(L, -1, 2); /* package.searchers[2] */
lua_loader_function = luaL_ref(L, LUA_REGISTRYINDEX);
lua_pushcfunction(L, luatex_kpse_lua_find);
lua_rawseti(L, -2, 2); /* replace the normal lua loader */
- lua_rawgeti(L, -1, 3); /* package.loaders[3] */
- lua_getfenv(L, -1);
- clua_loader_env = luaL_ref(L, LUA_REGISTRYINDEX);
+ lua_rawgeti(L, -1, 3); /* package.searchers[3] */
clua_loader_function = luaL_ref(L, LUA_REGISTRYINDEX);
lua_pushcfunction(L, luatex_kpse_clua_find);
lua_rawseti(L, -2, 3); /* replace the normal lua lib loader */
- lua_rawgeti(L, -1, 4); /* package.loaders[4] */
- lua_getfenv(L, -1);
- clua_loadall_env = luaL_ref(L, LUA_REGISTRYINDEX);
- clua_loadall_function = luaL_ref(L, LUA_REGISTRYINDEX);
- lua_pushcfunction(L, luatex_kpse_cluaall_find);
- lua_rawseti(L, -2, 4); /* replace the normal lua lib loader */
-
lua_pop(L, 2); /* pop the array and table */
}
@@ -780,11 +764,10 @@ void lua_initialize(int ac, char **av)
argc = ac;
argv = av;
- {
+ if (luatex_svn < 0) {
const char *fmt = "This is LuaTeX, Version %s-%s" WEB2CVERSION;
size_t len;
char buf[16];
-
sprintf(buf, "%d", luatex_date_info);
len = strlen(fmt) + strlen(luatex_version_string) + strlen(buf) - 3;
@@ -792,6 +775,14 @@ void lua_initialize(int ac, char **av)
that get replaced by the arguments. */
banner = xmalloc(len);
sprintf(banner, fmt, luatex_version_string, buf);
+ } else {
+ const char *fmt = "This is LuaTeX, Version %s-%s " WEB2CVERSION "(rev %d)";
+ size_t len;
+ char buf[16];
+ sprintf(buf, "%d", luatex_date_info);
+ len = strlen(fmt) + strlen(luatex_version_string) + strlen(buf) + 6;
+ banner = xmalloc(len);
+ sprintf(banner, fmt, luatex_version_string, buf, luatex_svn);
}
ptexbanner = banner;
@@ -859,6 +850,7 @@ void lua_initialize(int ac, char **av)
init_tex_table(Luas);
if (lua_pcall(Luas, 0, 0, 0)) {
fprintf(stdout, "%s\n", lua_tostring(Luas, -1));
+ lua_traceback(Luas);
exit(1);
}
/* no filename? quit now! */
@@ -911,7 +903,7 @@ void lua_initialize(int ac, char **av)
shellenabledp = 1;
restrictedshell = 1;
}
- free(v1);
+ free(v1);
}
/* If shell escapes are restricted, get allowed cmds from cnf. */
if (shellenabledp && restrictedshell == 1) {
@@ -919,7 +911,7 @@ void lua_initialize(int ac, char **av)
get_lua_string("texconfig", "shell_escape_commands", &v1);
if (v1) {
mk_shellcmdlist(v1);
- free(v1);
+ free(v1);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 16:05:35 +0000