Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 9caf48c
Move lua only code in a specific files so lua
Baptiste Daroussin committed 5 years ago
commit 9caf48cbea6d5a02267a8585431cbf22b196d636
parent e56811f
4 files changed +453 -383
modified libpkg/Makefile.autosetup
@@ -14,6 +14,7 @@ SRCS= backup.c \
	pkg_manifest.c \

	pkg_repo_update.c \

	pkgdb_iterator.c \
+ 
	lua.c \

	lua_scripts.c \

	scripts.c \

	diff.c \
added libpkg/lua.c
@@ -0,0 +1,415 @@
+ 
/*-
+ 
 * Copyright (c) 2019 Baptiste Daroussin <bapt@FreeBSD.org>
+ 
 * All rights reserved.
+ 
 *
+ 
 * Redistribution and use in source and binary forms, with or without
+ 
 * modification, are permitted provided that the following conditions
+ 
 * are met:
+ 
 * 1. Redistributions of source code must retain the above copyright
+ 
 *    notice, this list of conditions and the following disclaimer
+ 
 *    in this position and unchanged.
+ 
 * 2. Redistributions in binary form must reproduce the above copyright
+ 
 *    notice, this list of conditions and the following disclaimer in the
+ 
 *    documentation and/or other materials provided with the distribution.
+ 
 *
+ 
 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ 
 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ 
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ 
 * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ 
 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ 
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ 
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ 
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ 
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ 
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
 */
+
+ 
#include <sys/stat.h>
+ 
#include <sys/mman.h>
+
+ 
#include <errno.h>
+ 
#include <fcntl.h>
+ 
#include <stdbool.h>
+ 
#include <xstring.h>
+
+ 
#include "private/pkg.h"
+ 
#include "private/event.h"
+ 
#include "private/lua.h"
+
+ 
lua_CFunction
+ 
stack_dump(lua_State *L)
+ 
{
+ 
	int i;
+ 
	int top = lua_gettop(L);
+ 
	xstring *stack;
+ 
	char *stackstr;
+
+ 
	stack = xstring_new();
+
+ 
	fputs("\nLua Stack\n---------\n"
+ 
	    "\tType   Data\n\t-----------\n", stack->fp);
+
+ 
	for (i = 1; i <= top; i++) {  /* repeat for each level */
+ 
		int t = lua_type(L, i);
+ 
		fprintf(stack->fp, "%i", i);
+ 
		switch (t) {
+ 
		case LUA_TSTRING:  /* strings */
+ 
			fprintf(stack->fp, "\tString: `%s'\n", lua_tostring(L, i));
+ 
			break;
+ 
		case LUA_TBOOLEAN:  /* booleans */
+ 
			fprintf(stack->fp, "\tBoolean: %s", lua_toboolean(L, i) ? "\ttrue\n" : "\tfalse\n");
+ 
			break;
+ 
		case LUA_TNUMBER:  /* numbers */
+ 
			fprintf(stack->fp, "\tNumber: %g\n", lua_tonumber(L, i));
+ 
			break;
+ 
		default:  /* other values */
+ 
			fprintf(stack->fp, "\tOther: %s\n", lua_typename(L, t));
+ 
			break;
+ 
		}
+ 
	}
+ 
	stackstr = xstring_get(stack);
+ 
	pkg_emit_error("%s\n", stackstr);
+ 
	free(stackstr);
+
+ 
	return (0);
+ 
}
+
+ 
int
+ 
lua_print_msg(lua_State *L)
+ 
{
+ 
	int n = lua_gettop(L);
+ 
	luaL_argcheck(L, n == 1, n > 1 ? 2 : n,
+ 
	    "pkg.print_msg takes exactly one argument");
+ 
	const char* str = luaL_checkstring(L, 1);
+ 
	lua_getglobal(L, "msgfd");
+ 
	int fd = lua_tointeger(L, -1);
+
+ 
	dprintf(fd, "%s\n", str);
+
+ 
	return (0);
+ 
}
+
+ 
 int
+ 
lua_pkg_copy(lua_State *L)
+ 
{
+ 
	int n = lua_gettop(L);
+ 
	luaL_argcheck(L, n == 2, n > 2 ? 3 : n,
+ 
	    "pkg.copy takes exactly two arguments");
+ 
	const char* src = luaL_checkstring(L, 1);
+ 
	const char* dst = luaL_checkstring(L, 2);
+ 
	char *buf1, *buf2;
+ 
	struct stat s1;
+ 
	int fd1, fd2;
+ 
	struct timespec ts[2];
+
+ 
	bool install_as_user = (getenv("INSTALL_AS_USER") != NULL);
+
+ 
	lua_getglobal(L, "package");
+ 
	struct pkg *pkg = lua_touserdata(L, -1);
+
+ 
	if (fstatat(pkg->rootfd, RELATIVE_PATH(src), &s1, 0) == -1) {
+ 
		lua_pushinteger(L, 2);
+ 
		return (1);
+ 
	}
+ 
	fd1 = openat(pkg->rootfd, RELATIVE_PATH(src), O_RDONLY, DEFFILEMODE);
+ 
	if (fd1 == -1) {
+ 
		lua_pushinteger(L, 2);
+ 
		return (1);
+ 
	}
+ 
	/*
+ 
	 * We should be using O_WRONLY but a weird aarch64 pmap
+ 
	 * bug is preventing us doing that
+ 
	 * See https://bugs.freebsd.org/250271
+ 
	 */
+ 
	fd2 = openat(pkg->rootfd, RELATIVE_PATH(dst), O_RDWR | O_CREAT | O_TRUNC | O_EXCL, DEFFILEMODE);
+ 
	if (fd2 == -1) {
+ 
		lua_pushinteger(L, 2);
+ 
		return (1);
+ 
	}
+ 
	if (ftruncate(fd2, s1.st_size) != 0) {
+ 
		lua_pushinteger(L, -1);
+ 
		return (1);
+ 
	}
+ 
	buf1 = mmap(NULL, s1.st_size, PROT_READ, MAP_SHARED, fd1, 0);
+ 
	if (buf1 == NULL) {
+ 
		lua_pushinteger(L, -1);
+ 
		return (1);
+ 
	}
+ 
	/*
+ 
	 * We should be using only PROT_WRITE but a weird aarch64 pmap
+ 
	 * bug is preventing us doing that
+ 
	 * https://bugs.freebsd.org/250271
+ 
	 */
+ 
	buf2 = mmap(NULL, s1.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0);
+ 
	if (buf2 == NULL) {
+ 
		lua_pushinteger(L, -1);
+ 
		return (1);
+ 
	}
+
+ 
	memcpy(buf2, buf1, s1.st_size);
+
+ 
	munmap(buf1, s1.st_size);
+ 
	munmap(buf2, s1.st_size);
+ 
	fsync(fd2);
+
+ 
	close(fd1);
+ 
	close(fd2);
+
+ 
#ifdef HAVE_STRUCT_STAT_ST_MTIM
+ 
	ts[0] = s1.st_atim;
+ 
	ts[1] = s1.st_mtim;
+ 
#else
+ 
#if defined(_DARWIN_C_SOURCE) || defined(__APPLE__)
+ 
	ts[0] = s1.st_atimespec;
+ 
	ts[1] = s1.st_mtimespec;
+ 
#else
+ 
	ts[0].tv_sec = s1.st_atime;
+ 
	ts[0].tv_nsec = 0;
+ 
	ts[1].tv_sec = s1.st_mtime;
+ 
	ts[1].tv_nsec = 0;
+ 
#endif
+ 
#endif
+
+ 
	if (set_attrsat(pkg->rootfd, RELATIVE_PATH(dst), s1.st_mode, s1.st_uid,
+ 
	  s1.st_gid, &ts[0], &ts[1]) != EPKG_OK) {
+ 
		lua_pushinteger(L, -1);
+ 
		return (1);
+ 
	}
+
+ 
#ifdef HAVE_CHFLAGSAT
+ 
	if (!install_as_user && s1.st_flags != 0) {
+ 
		if (chflagsat(pkg->rootfd, RELATIVE_PATH(dst),
+ 
		    s1.st_flags, AT_SYMLINK_NOFOLLOW) == -1) {
+ 
			pkg_fatal_errno("Fail to chflags %s", dst);
+ 
			lua_pushinteger(L, -1);
+ 
			return (1);
+ 
		}
+ 
	}
+ 
#endif
+ 
	return (0);
+ 
}
+
+ 
int
+ 
lua_pkg_filecmp(lua_State *L)
+ 
{
+ 
	int n = lua_gettop(L);
+ 
	luaL_argcheck(L, n == 2, n > 2 ? 3 : n,
+ 
	    "pkg.filecmp takes exactly two arguments");
+ 
	const char* file1 = luaL_checkstring(L, 1);
+ 
	const char* file2 = luaL_checkstring(L, 2);
+ 
	char *buf1, *buf2;
+ 
	struct stat s1, s2;
+ 
	int fd1, fd2;
+ 
	int ret = 0;
+
+ 
	lua_getglobal(L, "package");
+ 
	struct pkg *pkg = lua_touserdata(L, -1);
+
+ 
	if (fstatat(pkg->rootfd, RELATIVE_PATH(file1), &s1, AT_SYMLINK_NOFOLLOW) == -1) {
+ 
		lua_pushinteger(L, 2);
+ 
		return (1);
+ 
	}
+ 
	if (fstatat(pkg->rootfd, RELATIVE_PATH(file2), &s2, AT_SYMLINK_NOFOLLOW) == -1) {
+ 
		lua_pushinteger(L, 2);
+ 
		return (1);
+ 
	}
+ 
	if (!S_ISREG(s1.st_mode) || !S_ISREG(s2.st_mode)) {
+ 
		lua_pushinteger(L, -1);
+ 
		return (1);
+ 
	}
+ 
	if (s1.st_size != s2.st_size) {
+ 
		lua_pushinteger(L, 1);
+ 
		return (1);
+ 
	}
+ 
	fd1 = openat(pkg->rootfd, RELATIVE_PATH(file1), O_RDONLY, DEFFILEMODE);
+ 
	if (fd1 == -1) {
+ 
		lua_pushinteger(L, 2);
+ 
		return (1);
+ 
	}
+ 
	fd2 = openat(pkg->rootfd, RELATIVE_PATH(file2), O_RDONLY, DEFFILEMODE);
+ 
	if (fd2 == -1) {
+ 
		lua_pushinteger(L, 2);
+ 
		return (1);
+ 
	}
+
+ 
	buf1 = mmap(NULL, s1.st_size, PROT_READ, MAP_SHARED, fd1, 0);
+ 
	if (buf1 == NULL) {
+ 
		lua_pushinteger(L, -1);
+ 
		return (1);
+ 
	}
+ 
	buf2 = mmap(NULL, s2.st_size, PROT_READ, MAP_SHARED, fd2, 0);
+ 
	if (buf2 == NULL) {
+ 
		lua_pushinteger(L, -1);
+ 
		return (1);
+ 
	}
+ 
	if (memcmp(buf1, buf2, s1.st_size) != 0)
+ 
		ret = 1;
+
+ 
	munmap(buf1, s1.st_size);
+ 
	munmap(buf2, s2.st_size);
+ 
	close(fd1);
+ 
	close(fd2);
+
+ 
	lua_pushinteger(L, ret);
+ 
	return (1);
+ 
}
+
+ 
int
+ 
lua_prefix_path(lua_State *L)
+ 
{
+ 
	int n = lua_gettop(L);
+ 
	luaL_argcheck(L, n == 1, n > 1 ? 2 : n,
+ 
	    "pkg.prefix_path takes exactly one argument");
+ 
	const char *str = luaL_checkstring(L, 1);
+ 
	lua_getglobal(L, "package");
+ 
	struct pkg *p = lua_touserdata(L, -1);
+
+ 
	char path[MAXPATHLEN];
+ 
	path[0] = '\0';
+
+ 
	if (*str == '/') {
+ 
		strlcat(path, str, MAXPATHLEN);
+ 
	} else {
+ 
		strlcat(path, p->prefix, MAXPATHLEN);
+ 
		strlcat(path, "/", MAXPATHLEN);
+ 
		strlcat(path, str, MAXPATHLEN);
+ 
	}
+
+ 
	lua_pushstring(L, path);
+ 
	return (1);
+ 
}
+
+ 
int
+ 
lua_stat(lua_State *L)
+ 
{
+ 
	int n = lua_gettop(L);
+ 
	luaL_argcheck(L, n == 1, n > 1 ? 2 : n,
+ 
	    "pkg.stat takes exactly one argument");
+ 
	const char *path = RELATIVE_PATH(luaL_checkstring(L, 1));
+ 
	lua_getglobal(L, "package");
+ 
	struct pkg *pkg = lua_touserdata(L, -1);
+ 
	struct stat s;
+ 
	const char *type = "unknown";
+
+ 
	if (fstatat(pkg->rootfd, path, &s, AT_SYMLINK_NOFOLLOW) == -1) {
+ 
		return lua_pushnil(L), 1;
+ 
	}
+
+ 
	lua_settop(L, 2);
+ 
	if (!lua_istable(L, 2))
+ 
		lua_newtable(L);
+
+ 
	lua_pushinteger(L, s.st_size);
+ 
	lua_setfield(L, -2, "size");
+ 
	lua_pushinteger(L, s.st_uid);
+ 
	lua_setfield(L, -2, "uid");
+ 
	lua_pushinteger(L, s.st_gid);
+ 
	lua_setfield(L, -2, "gid");
+ 
	if (S_ISREG(s.st_mode))
+ 
		type = "reg";
+ 
	else if (S_ISDIR(s.st_mode))
+ 
		type = "dir";
+ 
	else if (S_ISCHR(s.st_mode))
+ 
		type = "chr";
+ 
	else if (S_ISLNK(s.st_mode))
+ 
		type = "lnk";
+ 
	else if (S_ISSOCK(s.st_mode))
+ 
		type = "sock";
+ 
	else if (S_ISBLK(s.st_mode))
+ 
		type = "blk";
+ 
	else if (S_ISFIFO(s.st_mode))
+ 
		type = "fifo";
+ 
	lua_pushstring(L, type);
+ 
	lua_setfield(L, -2, "type");
+
+ 
	return (1);
+ 
}
+
+ 
/*
+ 
 * this is a copy of lua code to be able to override open
+ 
 * merge of newprefile and newfile
+ 
 */
+
+ 
static int
+ 
my_iofclose(lua_State *L)
+ 
{
+ 
	luaL_Stream *p = ((luaL_Stream *)luaL_checkudata(L, 1, LUA_FILEHANDLE));
+ 
	int res = fclose(p->f);
+ 
	return (luaL_fileresult(L, (res == 0), NULL));
+ 
}
+
+ 
static luaL_Stream *
+ 
newfile(lua_State *L) {
+ 
	luaL_Stream *p = (luaL_Stream *)lua_newuserdata(L, sizeof(luaL_Stream));
+ 
	p->f = NULL;
+ 
	p->closef = &my_iofclose;
+ 
	luaL_setmetatable(L, LUA_FILEHANDLE);
+ 
	return (p);
+ 
}
+
+ 
static int
+ 
lua_io_open(lua_State *L)
+ 
{
+ 
	const char *filename = luaL_checkstring(L, 1);
+ 
	const char *mode = luaL_optstring(L, 2, "r");
+ 
	lua_getglobal(L, "package");
+ 
	struct pkg *pkg = lua_touserdata(L, -1);
+ 
	int oflags;
+ 
	luaL_Stream *p = newfile(L);
+ 
	const char *md = mode;
+ 
	luaL_argcheck(L, checkflags(md, &oflags), 2, "invalid mode");
+ 
	int fd = openat(pkg->rootfd, RELATIVE_PATH(filename), oflags, DEFFILEMODE);
+ 
	if (fd == -1)
+ 
		return (luaL_fileresult(L, 0, filename));
+ 
	p->f = fdopen(fd, mode);
+ 
	return ((p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1);
+ 
}
+
+ 
static int
+ 
lua_os_remove(lua_State *L) {
+ 
	const char *filename = RELATIVE_PATH(luaL_checkstring(L, 1));
+ 
	lua_getglobal(L, "package");
+ 
	struct pkg *pkg = lua_touserdata(L, -1);
+ 
	int flag = 0;
+ 
	struct stat st;
+
+ 
	if (fstatat(pkg->rootfd, filename, &st, AT_SYMLINK_NOFOLLOW) == -1)
+ 
		return (luaL_fileresult(L, 1, NULL));
+
+ 
	if (S_ISDIR(st.st_mode))
+ 
		flag = AT_REMOVEDIR;
+
+ 
	return (luaL_fileresult(L, unlinkat(pkg->rootfd, filename, flag) == 0, NULL));
+ 
}
+
+ 
static int
+ 
lua_os_rename(lua_State *L)
+ 
{
+ 
	const char *fromname = RELATIVE_PATH(luaL_checkstring(L, 1));
+ 
	const char *toname = RELATIVE_PATH(luaL_checkstring(L, 2));
+ 
	lua_getglobal(L, "package");
+ 
	struct pkg *pkg = lua_touserdata(L, -1);
+ 
	return luaL_fileresult(L, renameat(pkg->rootfd, fromname, pkg->rootfd, toname) == 0, NULL);
+ 
}
+
+ 
static int
+ 
lua_os_execute(lua_State *L)
+ 
{
+ 
	return (luaL_error(L, "os.execute not available"));
+ 
}
+
+ 
void
+ 
lua_override_ios(lua_State *L)
+ 
{
+ 
	lua_getglobal(L, "io");
+ 
	lua_pushcfunction(L, lua_io_open);
+ 
	lua_setfield(L, -2, "open");
+
+ 
	lua_getglobal(L, "os");
+ 
	lua_pushcfunction(L, lua_os_remove);
+ 
	lua_setfield(L, -2, "remove");
+ 
	lua_pushcfunction(L, lua_os_rename);
+ 
	lua_setfield(L, -2, "rename");
+ 
	lua_pushcfunction(L, lua_os_execute);
+ 
	lua_setfield(L, -2, "execute");
+ 
}
modified libpkg/lua_scripts.c
@@ -34,404 +34,22 @@
#include <sys/capsicum.h>

#endif
- 
#include <sys/stat.h>

#include <sys/types.h>

#include <sys/wait.h>
- 
#include <sys/mman.h>



#include <errno.h>

#include <poll.h>

#include <xstring.h>
- 
#include <lauxlib.h>
- 
#include <lualib.h>
- 
#include <fcntl.h>

#include <err.h>

#include <stdio.h>



#include "pkg.h"

#include "private/pkg.h"

#include "private/event.h"
+ 
#include "private/lua.h"



extern char **environ;
- 
static lua_CFunction
- 
stack_dump(lua_State *L)
- 
{
- 
	int i;
- 
	int top = lua_gettop(L);
- 
	xstring *stack;
- 
	char *stackstr;
-
- 
	stack = xstring_new();
-
- 
	fputs("\nLua Stack\n---------\n"
- 
	    "\tType   Data\n\t-----------\n", stack->fp);
-
- 
	for (i = 1; i <= top; i++) {  /* repeat for each level */
- 
		int t = lua_type(L, i);
- 
		fprintf(stack->fp, "%i", i);
- 
		switch (t) {
- 
		case LUA_TSTRING:  /* strings */
- 
			fprintf(stack->fp, "\tString: `%s'\n", lua_tostring(L, i));
- 
			break;
- 
		case LUA_TBOOLEAN:  /* booleans */
- 
			fprintf(stack->fp, "\tBoolean: %s", lua_toboolean(L, i) ? "\ttrue\n" : "\tfalse\n");
- 
			break;
- 
		case LUA_TNUMBER:  /* numbers */
- 
			fprintf(stack->fp, "\tNumber: %g\n", lua_tonumber(L, i));
- 
			break;
- 
		default:  /* other values */
- 
			fprintf(stack->fp, "\tOther: %s\n", lua_typename(L, t));
- 
			break;
- 
		}
- 
	}
- 
	stackstr = xstring_get(stack);
- 
	pkg_emit_error("%s\n", stackstr);
- 
	free(stackstr);
-
- 
	return (0);
- 
}
-
- 
static int
- 
lua_print_msg(lua_State *L)
- 
{
- 
	int n = lua_gettop(L);
- 
	luaL_argcheck(L, n == 1, n > 1 ? 2 : n,
- 
	    "pkg.print_msg takes exactly one argument");
- 
	const char* str = luaL_checkstring(L, 1);
- 
	lua_getglobal(L, "msgfd");
- 
	int fd = lua_tointeger(L, -1);
-
- 
	dprintf(fd, "%s\n", str);
-
- 
	return (0);
- 
}
-
- 
static int
- 
lua_pkg_copy(lua_State *L)
- 
{
- 
	int n = lua_gettop(L);
- 
	luaL_argcheck(L, n == 2, n > 2 ? 3 : n,
- 
	    "pkg.copy takes exactly two arguments");
- 
	const char* src = luaL_checkstring(L, 1);
- 
	const char* dst = luaL_checkstring(L, 2);
- 
	char *buf1, *buf2;
- 
	struct stat s1;
- 
	int fd1, fd2;
- 
	struct timespec ts[2];
-
- 
	bool install_as_user = (getenv("INSTALL_AS_USER") != NULL);
-
- 
	lua_getglobal(L, "package");
- 
	struct pkg *pkg = lua_touserdata(L, -1);
-
- 
	if (fstatat(pkg->rootfd, RELATIVE_PATH(src), &s1, 0) == -1) {
- 
		lua_pushinteger(L, 2);
- 
		return (1);
- 
	}
- 
	fd1 = openat(pkg->rootfd, RELATIVE_PATH(src), O_RDONLY, DEFFILEMODE);
- 
	if (fd1 == -1) {
- 
		lua_pushinteger(L, 2);
- 
		return (1);
- 
	}
- 
	/*
- 
	 * We should be using O_WRONLY but a weird aarch64 pmap
- 
	 * bug is preventing us doing that
- 
	 * See https://bugs.freebsd.org/250271
- 
	 */
- 
	fd2 = openat(pkg->rootfd, RELATIVE_PATH(dst), O_RDWR | O_CREAT | O_TRUNC | O_EXCL, DEFFILEMODE);
- 
	if (fd2 == -1) {
- 
		lua_pushinteger(L, 2);
- 
		return (1);
- 
	}
- 
	if (ftruncate(fd2, s1.st_size) != 0) {
- 
		lua_pushinteger(L, -1);
- 
		return (1);
- 
	}
- 
	buf1 = mmap(NULL, s1.st_size, PROT_READ, MAP_SHARED, fd1, 0);
- 
	if (buf1 == NULL) {
- 
		lua_pushinteger(L, -1);
- 
		return (1);
- 
	}
- 
	/*
- 
	 * We should be using only PROT_WRITE but a weird aarch64 pmap
- 
	 * bug is preventing us doing that
- 
	 * https://bugs.freebsd.org/250271
- 
	 */
- 
	buf2 = mmap(NULL, s1.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0);
- 
	if (buf2 == NULL) {
- 
		lua_pushinteger(L, -1);
- 
		return (1);
- 
	}
-
- 
	memcpy(buf2, buf1, s1.st_size);
-
- 
	munmap(buf1, s1.st_size);
- 
	munmap(buf2, s1.st_size);
- 
	fsync(fd2);
-
- 
	close(fd1);
- 
	close(fd2);
-
- 
#ifdef HAVE_STRUCT_STAT_ST_MTIM
- 
	ts[0] = s1.st_atim;
- 
	ts[1] = s1.st_mtim;
- 
#else
- 
#if defined(_DARWIN_C_SOURCE) || defined(__APPLE__)
- 
	ts[0] = s1.st_atimespec;
- 
	ts[1] = s1.st_mtimespec;
- 
#else
- 
	ts[0].tv_sec = s1.st_atime;
- 
	ts[0].tv_nsec = 0;
- 
	ts[1].tv_sec = s1.st_mtime;
- 
	ts[1].tv_nsec = 0;
- 
#endif
- 
#endif
-
- 
	if (set_attrsat(pkg->rootfd, RELATIVE_PATH(dst), s1.st_mode, s1.st_uid,
- 
	  s1.st_gid, &ts[0], &ts[1]) != EPKG_OK) {
- 
		lua_pushinteger(L, -1);
- 
		return (1);
- 
	}
-
- 
#ifdef HAVE_CHFLAGSAT
- 
	if (!install_as_user && s1.st_flags != 0) {
- 
		if (chflagsat(pkg->rootfd, RELATIVE_PATH(dst),
- 
		    s1.st_flags, AT_SYMLINK_NOFOLLOW) == -1) {
- 
			pkg_fatal_errno("Fail to chflags %s", dst);
- 
			lua_pushinteger(L, -1);
- 
			return (1);
- 
		}
- 
	}
- 
#endif
- 
	return (0);
- 
}
-
- 
static int
- 
lua_pkg_filecmp(lua_State *L)
- 
{
- 
	int n = lua_gettop(L);
- 
	luaL_argcheck(L, n == 2, n > 2 ? 3 : n,
- 
	    "pkg.filecmp takes exactly two arguments");
- 
	const char* file1 = luaL_checkstring(L, 1);
- 
	const char* file2 = luaL_checkstring(L, 2);
- 
	char *buf1, *buf2;
- 
	struct stat s1, s2;
- 
	int fd1, fd2;
- 
	int ret = 0;
-
- 
	lua_getglobal(L, "package");
- 
	struct pkg *pkg = lua_touserdata(L, -1);
-
- 
	if (fstatat(pkg->rootfd, RELATIVE_PATH(file1), &s1, AT_SYMLINK_NOFOLLOW) == -1) {
- 
		lua_pushinteger(L, 2);
- 
		return (1);
- 
	}
- 
	if (fstatat(pkg->rootfd, RELATIVE_PATH(file2), &s2, AT_SYMLINK_NOFOLLOW) == -1) {
- 
		lua_pushinteger(L, 2);
- 
		return (1);
- 
	}
- 
	if (!S_ISREG(s1.st_mode) || !S_ISREG(s2.st_mode)) {
- 
		lua_pushinteger(L, -1);
- 
		return (1);
- 
	}
- 
	if (s1.st_size != s2.st_size) {
- 
		lua_pushinteger(L, 1);
- 
		return (1);
- 
	}
- 
	fd1 = openat(pkg->rootfd, RELATIVE_PATH(file1), O_RDONLY, DEFFILEMODE);
- 
	if (fd1 == -1) {
- 
		lua_pushinteger(L, 2);
- 
		return (1);
- 
	}
- 
	fd2 = openat(pkg->rootfd, RELATIVE_PATH(file2), O_RDONLY, DEFFILEMODE);
- 
	if (fd2 == -1) {
- 
		lua_pushinteger(L, 2);
- 
		return (1);
- 
	}
-
- 
	buf1 = mmap(NULL, s1.st_size, PROT_READ, MAP_SHARED, fd1, 0);
- 
	if (buf1 == NULL) {
- 
		lua_pushinteger(L, -1);
- 
		return (1);
- 
	}
- 
	buf2 = mmap(NULL, s2.st_size, PROT_READ, MAP_SHARED, fd2, 0);
- 
	if (buf2 == NULL) {
- 
		lua_pushinteger(L, -1);
- 
		return (1);
- 
	}
- 
	if (memcmp(buf1, buf2, s1.st_size) != 0)
- 
		ret = 1;
-
- 
	munmap(buf1, s1.st_size);
- 
	munmap(buf2, s2.st_size);
- 
	close(fd1);
- 
	close(fd2);
-
- 
	lua_pushinteger(L, ret);
- 
	return (1);
- 
}
-
- 
static int
- 
lua_prefix_path(lua_State *L)
- 
{
- 
	int n = lua_gettop(L);
- 
	luaL_argcheck(L, n == 1, n > 1 ? 2 : n,
- 
	    "pkg.prefix_path takes exactly one argument");
- 
	const char *str = luaL_checkstring(L, 1);
- 
	lua_getglobal(L, "package");
- 
	struct pkg *p = lua_touserdata(L, -1);
-
- 
	char path[MAXPATHLEN];
- 
	path[0] = '\0';
-
- 
	if (*str == '/') {
- 
		strlcat(path, str, MAXPATHLEN);
- 
	} else {
- 
		strlcat(path, p->prefix, MAXPATHLEN);
- 
		strlcat(path, "/", MAXPATHLEN);
- 
		strlcat(path, str, MAXPATHLEN);
- 
	}
-
- 
	lua_pushstring(L, path);
- 
	return (1);
- 
}
-
- 
/*
- 
 * this is a copy of lua code to be able to override open
- 
 * merge of newprefile and newfile
- 
 */
-
- 
static int
- 
my_iofclose(lua_State *L)
- 
{
- 
	luaL_Stream *p = ((luaL_Stream *)luaL_checkudata(L, 1, LUA_FILEHANDLE));
- 
	int res = fclose(p->f);
- 
	return (luaL_fileresult(L, (res == 0), NULL));
- 
}
-
- 
static luaL_Stream *
- 
newfile(lua_State *L) {
- 
	luaL_Stream *p = (luaL_Stream *)lua_newuserdata(L, sizeof(luaL_Stream));
- 
	p->f = NULL;
- 
	p->closef = &my_iofclose;
- 
	luaL_setmetatable(L, LUA_FILEHANDLE);
- 
	return (p);
- 
}
-
- 
static int
- 
lua_io_open(lua_State *L)
- 
{
- 
	const char *filename = luaL_checkstring(L, 1);
- 
	const char *mode = luaL_optstring(L, 2, "r");
- 
	lua_getglobal(L, "package");
- 
	struct pkg *pkg = lua_touserdata(L, -1);
- 
	int oflags;
- 
	luaL_Stream *p = newfile(L);
- 
	const char *md = mode;
- 
	luaL_argcheck(L, checkflags(md, &oflags), 2, "invalid mode");
- 
	int fd = openat(pkg->rootfd, RELATIVE_PATH(filename), oflags, DEFFILEMODE);
- 
	if (fd == -1)
- 
		return (luaL_fileresult(L, 0, filename));
- 
	p->f = fdopen(fd, mode);
- 
	return ((p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1);
- 
}
-
- 
static int
- 
lua_os_remove(lua_State *L) {
- 
	const char *filename = RELATIVE_PATH(luaL_checkstring(L, 1));
- 
	lua_getglobal(L, "package");
- 
	struct pkg *pkg = lua_touserdata(L, -1);
- 
	int flag = 0;
- 
	struct stat st;
-
- 
	if (fstatat(pkg->rootfd, filename, &st, AT_SYMLINK_NOFOLLOW) == -1)
- 
		return (luaL_fileresult(L, 1, NULL));
-
- 
	if (S_ISDIR(st.st_mode))
- 
		flag = AT_REMOVEDIR;
-
- 
	return (luaL_fileresult(L, unlinkat(pkg->rootfd, filename, flag) == 0, NULL));
- 
}
-
- 
static int
- 
lua_os_rename(lua_State *L)
- 
{
- 
	const char *fromname = RELATIVE_PATH(luaL_checkstring(L, 1));
- 
	const char *toname = RELATIVE_PATH(luaL_checkstring(L, 2));
- 
	lua_getglobal(L, "package");
- 
	struct pkg *pkg = lua_touserdata(L, -1);
- 
	return luaL_fileresult(L, renameat(pkg->rootfd, fromname, pkg->rootfd, toname) == 0, NULL);
- 
}
-
- 
static int
- 
lua_stat(lua_State *L)
- 
{
- 
	int n = lua_gettop(L);
- 
	luaL_argcheck(L, n == 1, n > 1 ? 2 : n,
- 
	    "pkg.stat takes exactly one argument");
- 
	const char *path = RELATIVE_PATH(luaL_checkstring(L, 1));
- 
	lua_getglobal(L, "package");
- 
	struct pkg *pkg = lua_touserdata(L, -1);
- 
	struct stat s;
- 
	const char *type = "unknown";
-
- 
	if (fstatat(pkg->rootfd, path, &s, AT_SYMLINK_NOFOLLOW) == -1) {
- 
		return lua_pushnil(L), 1;
- 
	}
-
- 
	lua_settop(L, 2);
- 
	if (!lua_istable(L, 2))
- 
		lua_newtable(L);
-
- 
	lua_pushinteger(L, s.st_size);
- 
	lua_setfield(L, -2, "size");
- 
	lua_pushinteger(L, s.st_uid);
- 
	lua_setfield(L, -2, "uid");
- 
	lua_pushinteger(L, s.st_gid);
- 
	lua_setfield(L, -2, "gid");
- 
	if (S_ISREG(s.st_mode))
- 
		type = "reg";
- 
	else if (S_ISDIR(s.st_mode))
- 
		type = "dir";
- 
	else if (S_ISCHR(s.st_mode))
- 
		type = "chr";
- 
	else if (S_ISLNK(s.st_mode))
- 
		type = "lnk";
- 
	else if (S_ISSOCK(s.st_mode))
- 
		type = "sock";
- 
	else if (S_ISBLK(s.st_mode))
- 
		type = "blk";
- 
	else if (S_ISFIFO(s.st_mode))
- 
		type = "fifo";
- 
	lua_pushstring(L, type);
- 
	lua_setfield(L, -2, "type");
-
- 
	return (1);
- 
}
-
- 
static int
- 
lua_os_execute(lua_State *L)
- 
{
- 
	return (luaL_error(L, "os.execute not available"));
- 
}
-
- 
static void
- 
lua_override_ios(lua_State *L)
- 
{
- 
	lua_getglobal(L, "io");
- 
	lua_pushcfunction(L, lua_io_open);
- 
	lua_setfield(L, -2, "open");
-
- 
	lua_getglobal(L, "os");
- 
	lua_pushcfunction(L, lua_os_remove);
- 
	lua_setfield(L, -2, "remove");
- 
	lua_pushcfunction(L, lua_os_rename);
- 
	lua_setfield(L, -2, "rename");
- 
	lua_pushcfunction(L, lua_os_execute);
- 
	lua_setfield(L, -2, "execute");
- 
}
- 


int

pkg_lua_script_run(struct pkg * const pkg, pkg_lua_script type, bool upgrade)

{
added libpkg/private/lua.h
@@ -0,0 +1,36 @@
+ 
/*-
+ 
 * Copyright (c) 2019 Baptiste Daroussin <bapt@FreeBSD.org>
+ 
 * All rights reserved.
+ 
 *
+ 
 * Redistribution and use in source and binary forms, with or without
+ 
 * modification, are permitted provided that the following conditions
+ 
 * are met:
+ 
 * 1. Redistributions of source code must retain the above copyright
+ 
 *    notice, this list of conditions and the following disclaimer
+ 
 *    in this position and unchanged.
+ 
 * 2. Redistributions in binary form must reproduce the above copyright
+ 
 *    notice, this list of conditions and the following disclaimer in the
+ 
 *    documentation and/or other materials provided with the distribution.
+ 
 *
+ 
 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ 
 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ 
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ 
 * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ 
 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ 
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ 
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ 
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ 
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ 
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
 */
+
+ 
#include <lauxlib.h>
+ 
#include <lualib.h>
+
+ 
lua_CFunction stack_dump(lua_State *L);
+ 
int lua_print_msg(lua_State *L);
+ 
int lua_pkg_copy(lua_State *L);
+ 
int lua_pkg_filecmp(lua_State *L);
+ 
int lua_prefix_path(lua_State *L);
+ 
void lua_override_ios(lua_State *L);
+ 
int lua_stat(lua_State *L);