7:28 a.m.
Evening,
I've made all new error numbers conditional and rebased on top of the new
master.
Cheers,
Richard
Richard Ipsum (4):
Define additional POSIX error numbers
simple: Add fdopen
Add sigpending, sigsuspend, sigwait, sigwaitinfo, sigtimedwait and
raise
Add license statements
Makefile | 1 +
findlua.mk | 1 +
luxio.c | 282 ++++++++++++++++++++++++++++++++++------
luxio/simple.lua | 18 +++
luxio_constants.inc.in | 52 +++++++-
tests/test-access.lua | 1 +
tests/test-creat.lua | 1 +
tests/test-dirent.lua | 1 +
tests/test-event-serv.lua | 1 +
tests/test-fcntl-lock-1.lua | 1 +
tests/test-fcntl-lock-2.lua | 1 +
tests/test-forkexecpwaitpid.lua | 1 +
tests/test-forkexecwaitpid.lua | 1 +
tests/test-http-client.lua | 1 +
tests/test-iconv.lua | 1 +
tests/test-mqueue-read.lua | 1 +
tests/test-mqueue-write.lua | 1 +
tests/test-poll-serv.lua | 1 +
tests/test-select.lua | 1 +
tests/test-setsid.lua | 1 +
tests/test-sigaction.lua | 1 +
tests/test-sigpending.lua | 18 +++
tests/test-sigprocmask.lua | 1 +
tests/test-sigsuspend.lua | 16 +++
tests/test-sigtimedwait.lua | 38 ++++++
tests/test-sigwait.lua | 22 ++++
tests/test-sigwaitinfo.lua | 22 ++++
tests/test-sio-http-client.lua | 1 +
tests/test-splice.lua | 1 +
tests/test-subprocess.lua | 1 +
tests/test-sysconf.lua | 1 +
tests/test-syslog.lua | 1 +
tests/test-termident.lua | 1 +
tests/test-uds-server.lua | 1 +
34 files changed, 452 insertions(+), 42 deletions(-)
create mode 100644 tests/test-sigpending.lua
create mode 100644 tests/test-sigsuspend.lua
create mode 100644 tests/test-sigtimedwait.lua
create mode 100644 tests/test-sigwait.lua
create mode 100644 tests/test-sigwaitinfo.lua
--
2.11.0
7:28 a.m.
New subject: [PATCH 1/4] Define additional POSIX error numbers
Error numbers are defined according to:
http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/errno.h.html
---
luxio_constants.inc.in | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 49 insertions(+), 2 deletions(-)
diff --git a/luxio_constants.inc.in b/luxio_constants.inc.in
index a812715..9cd058f 100644
--- a/luxio_constants.inc.in
+++ b/luxio_constants.inc.in
@@ -11,39 +11,86 @@ static const struct {
} luxio_numeric_constants[] = {
/* errors */
+? E(E2BIG),
E(EACCES),
+? E(EADDRINUSE),
E(EADDRNOTAVAIL),
E(EAFNOSUPPORT),
- E(EEXIST),
+? E(EAGAIN),
+? E(EALREADY),
E(EBADF),
+? E(EBADMSG),
+? E(EBUSY),
+? E(ECANCELED),
+? E(ECHILD),
+? E(ECONNABORTED),
+? E(ECONNREFUSED),
+? E(ECONNRESET),
+? E(EDEADLK),
+? E(EDESTADDRREQ),
+? E(EDOM),
+? E(EDQUOT),
+? E(EEXIST),
E(EFAULT),
E(EFBIG),
+? E(EHOSTUNREACH),
+? E(EIDRM),
+? E(EILSEQ),
+? E(EINPROGRESS),
E(EINTR),
+ E(EINVAL),
E(EIO),
+? E(EISCONN),
E(EISDIR),
- E(EINVAL),
E(ELOOP),
E(EMFILE),
+? E(EMLINK),
+? E(EMSGSIZE),
+#ifdef __linux__
+ E(EMULTIHOP),
+#endif
E(ENAMETOOLONG),
+? E(ENETDOWN),
+? E(ENETRESET),
+? E(ENETUNREACH),
E(ENFILE),
E(ENOBUFS),
E(ENODEV),
E(ENOENT),
+? E(ENOEXEC),
+? E(ENOLCK),
+#ifdef __linux__
+ E(ENOLINK),
+#endif
E(ENOMEM),
+? E(ENOMSG),
+? E(ENOPROTOOPT),
E(ENOSPC),
+? E(ENOSYS),
E(ENOTCONN),
E(ENOTDIR),
+? E(ENOTEMPTY),
+? E(ENOTRECOVERABLE),
E(ENOTSOCK),
+? E(ENOTSUP),
E(ENOTTY),
E(ENXIO),
+? E(EOPNOTSUPP),
E(EOVERFLOW),
+? E(EOWNERDEAD),
E(EPERM),
+? E(EPROTO),
E(EPROTONOSUPPORT),
+? E(EPROTOTYPE),
+? E(ERANGE),
E(EROFS),
? E(ESPIPE),
E(ESRCH),
+? E(ESTALE),
+? E(ETIMEDOUT),
E(ETXTBSY),
E(EWOULDBLOCK),
+? E(EXDEV),
/* open-related defines */
E(O_RDONLY),
--
2.11.0
7:28 a.m.
New subject: [PATCH 2/4] simple: Add fdopen
---
luxio/simple.lua | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/luxio/simple.lua b/luxio/simple.lua
index 1f81d30..bb654e0 100644
--- a/luxio/simple.lua
+++ b/luxio/simple.lua
@@ -814,6 +814,23 @@ local function open(filename, flags, mode)
return sio_wrap_mt(r, false, filename)
end
+--- Open a file from a file descriptor.
+--- @tparam number fd file descriptor to open from
+--- @treturn file|nil File handle, or nil if error
+--- @treturn string|nil Error string if error
+--- @treturn errno|nil Error number if error
+--- @function fdopen
+local function fdopen(fd)
+ -- Ensure the fd is valid before returning a file handle for it
+ local flags, errno = l_fcntl(fd, l.F_GETFL)
+
+ if flags == -1 then
+ return err("fdopen", errno)
+ end
+
+ return sio_wrap_mt(fd, false, nil)
+end
+
local pipe_count = 0
--- Create an anonymous pipe.
@@ -1461,6 +1478,7 @@ end
return {
open = open,
+ fdopen = fdopen,
pipe = pipe,
socketpair = socketpair,
inet = inet,
--
2.11.0
7:28 a.m.
New subject: [PATCH 3/4] Add sigpending, sigsuspend, sigwait, sigwaitinfo, sigtimedwait and raise
---
luxio.c | 282 +++++++++++++++++++++++++++++++++++++-------
tests/test-sigpending.lua | 17 +++
tests/test-sigsuspend.lua | 15 +++
tests/test-sigtimedwait.lua | 37 ++++++
tests/test-sigwait.lua | 21 ++++
tests/test-sigwaitinfo.lua | 21 ++++
6 files changed, 353 insertions(+), 40 deletions(-)
create mode 100644 tests/test-sigpending.lua
create mode 100644 tests/test-sigsuspend.lua
create mode 100644 tests/test-sigtimedwait.lua
create mode 100644 tests/test-sigwait.lua
create mode 100644 tests/test-sigwaitinfo.lua
diff --git a/luxio.c b/luxio.c
index e31fd8d..e5b370c 100644
--- a/luxio.c
+++ b/luxio.c
@@ -606,10 +606,12 @@ luxio_sigdelset(lua_State *L)
/*** Check whether a signal set contains a given signal.
-Return 0 on success, or -1 on error with errno set appropriately.
+Return 1 if signal is a member of the set, or 0 if the signal is
+not a member of the set. A return value of -1 indicates that an error
+occurred and errno will be set accordingly.
-@tparam sigset signal set
-@tparam number signo signal
+@tparam sigset set
+@tparam number signal
@treturn number return value
@treturn errno errno
@function sigismember
@@ -640,56 +642,66 @@ static struct {
bool sigaction;
} luxio__signal_ctx;
-static void luxio__sigaction_hook(lua_State *L, lua_Debug *ar)
+static void luxio__push_siginfo_table(lua_State *L, const siginfo_t *info)
{
- int nargs = 1;
+ lua_newtable(L);
- /* Push the callback onto the stack using the Lua reference we */
- /* stored in the registry */
- lua_rawgeti(L, LUA_REGISTRYINDEX,
- luxio__signal_ctx.handlers[luxio__signal_ctx.signo].handler_fn);
- lua_pushinteger(L, luxio__signal_ctx.signo);
+ lua_pushinteger(L, info->si_signo);
+ lua_setfield(L, -2, "si_signo");
- if (luxio__signal_ctx.sigaction) {
- nargs++;
+ lua_pushinteger(L, info->si_code);
+ lua_setfield(L, -2, "si_code");
- if (luxio__signal_ctx.isinfo) {
- siginfo_t *info = &luxio__signal_ctx.info;
- lua_newtable(L);
+ lua_pushinteger(L, info->si_errno);
+ lua_setfield(L, -2, "si_errno");
- lua_pushinteger(L, info->si_signo);
- lua_setfield(L, -2, "si_signo");
+ lua_pushinteger(L, info->si_pid);
+ lua_setfield(L, -2, "si_pid");
- lua_pushinteger(L, info->si_code);
- lua_setfield(L, -2, "si_code");
+ lua_pushinteger(L, info->si_uid);
+ lua_setfield(L, -2, "si_uid");
- lua_pushinteger(L, info->si_errno);
- lua_setfield(L, -2, "si_errno");
+ lua_pushinteger(L, info->si_utime);
+ lua_setfield(L, -2, "si_utime");
- lua_pushinteger(L, info->si_pid);
- lua_setfield(L, -2, "si_pid");
+ lua_pushinteger(L, info->si_stime);
+ lua_setfield(L, -2, "si_stime");
- lua_pushinteger(L, info->si_uid);
- lua_setfield(L, -2, "si_uid");
+ lua_pushinteger(L, (lua_Integer) info->si_addr);
+ lua_setfield(L, -2, "si_addr");
+
+ lua_pushinteger(L, info->si_status);
+ lua_setfield(L, -2, "si_status");
#ifndef __FreeBSD__
- lua_pushinteger(L, info->si_utime);
- lua_setfield(L, -2, "si_utime");
+ lua_pushinteger(L, info->si_utime);
+ lua_setfield(L, -2, "si_utime");
- lua_pushinteger(L, info->si_stime);
- lua_setfield(L, -2, "si_stime");
+ lua_pushinteger(L, info->si_stime);
+ lua_setfield(L, -2, "si_stime");
#endif
- lua_pushinteger(L, (lua_Integer) info->si_addr);
- lua_setfield(L, -2, "si_addr");
-
- lua_pushinteger(L, info->si_status);
- lua_setfield(L, -2, "si_status");
-
#ifdef __linux__
- lua_pushinteger(L, info->si_band);
- lua_setfield(L, -2, "si_band");
+ lua_pushinteger(L, info->si_band);
+ lua_setfield(L, -2, "si_band");
#endif
+}
+
+static void luxio__sigaction_hook(lua_State *L, lua_Debug *ar)
+{
+ int nargs = 1;
+
+ /* Push the callback onto the stack using the Lua reference we */
+ /* stored in the registry */
+ lua_rawgeti(L, LUA_REGISTRYINDEX,
+ luxio__signal_ctx.handlers[luxio__signal_ctx.signo].handler_fn);
+ lua_pushinteger(L, luxio__signal_ctx.signo);
+
+ if (luxio__signal_ctx.sigaction) {
+ nargs++;
+
+ if (luxio__signal_ctx.isinfo) {
+ luxio__push_siginfo_table(L, &luxio__signal_ctx.info);
} else {
lua_pushnil(L);
}
@@ -936,9 +948,190 @@ luxio_sigprocmask(lua_State *L)
return 2;
}
-/* TODO: sigpending() 3.3.6 */
-/* TODO: sigsuspend() 3.3.7 */
-/* TODO: sigwait(), sigwaitinfo(), sigtimedwait() 3.3.8 */
+/*** Send a signal to the calling process.
+
+@tparam sig signal The signal to send
+@treturn number return value
+@treturn errno
+@function raise
+*/
+static int
+luxio_raise(lua_State *L)
+{
+ int sig = luaL_checkinteger(L, 1);
+
+ lua_pushinteger(L, raise(sig));
+ lua_pushinteger(L, errno);
+ return 2;
+}
+
+/*** Return set of signals pending for the calling process.
+
+@treturn sigset|nil set of pending signals, or nil on error
+@treturn errno
+@function sigpending
+*/
+static int
+luxio_sigpending(lua_State *L)
+{
+ sigset_t s;
+ luxio_signalset *pending;
+
+ if (sigpending(&s) == -1) {
+ lua_pushinteger(L, -1);
+ } else {
+ pending = lua_newuserdata(L, sizeof(*pending));
+ pending->set = s;
+ luxio__bless_signalset(L);
+ }
+
+ lua_pushinteger(L, errno);
+ return 2;
+}
+
+/*** Suspend execution of calling process until signal is delivered.
+
+sigsuspend temporarily replaces the signal mask of the calling
+process with another mask until delivery of a signal that is not
+masked occurs. sigsuspend always returns -1, with errno set to
+indicate the error (which is generally EINTR). Upon returning
+sigsuspend will restore the original signal mask that was replaced.
+
+@tparam set mask
+@treturn number return value
+@treturn errno
+@function sigsuspend
+*/
+static int
+luxio_sigsuspend(lua_State *L)
+{
+ luxio_signalset *s = luaL_checkudata(L, 1, LUXIO_SIGNALSET_METATABLE);
+
+ lua_pushinteger(L, sigsuspend(&s->set));
+ lua_pushinteger(L, errno);
+ return 2;
+}
+
+/*** Suspend execution of calling process until signal becomes pending.
+
+sigwait temporarily waits for any one of the signals provided in
+the set parameter to become pending. The signal that becomes
+pending will be removed from the set. On success the pending signal
+will be returned, otherwise nil is returned and errno is set accordingly.
+
+@tparam set set of signals to wait on
+@treturn number|nil signal, or nil on error
+@treturn errno
+@function sigwait
+*/
+static int
+luxio_sigwait(lua_State *L)
+{
+ luxio_signalset *s = luaL_checkudata(L, 1, LUXIO_SIGNALSET_METATABLE);
+ int sig;
+
+ if (sigwait(&s->set, &sig) == -1) {
+ lua_pushnil(L);
+ } else {
+ lua_pushinteger(L, sig);
+ }
+
+ lua_pushinteger(L, errno);
+ return 2;
+}
+
+#ifdef __linux__
+/*** Suspend execution of calling process until signal becomes pending.
+
+Linux only.
+
+sigwaitinfo suspends execution of the calling process until one of
+the signals provided in the set parameter is pending. If one of
+the signals is already pending then sigwaitinfo will return without
+suspending execution.
+
+sigwaitinfo returns the info table for the signal that was received
+and removes that signal from the set argument.
+
+If multiple signals are pending then the signal returned by sigwaitinfo is
+determined using the usual rules detailed in signal(7).
+
+@tparam set set of signals to wait on
+@treturn sigwaitinfo-table|nil signal info table, or nil on error
+@treturn errno
+@function sigwaitinfo
+*/
+
+/*** sigwaitinfo() table
+@table sigwaitinfo-table
+@field si_signo Signal number
+@field si_code Signal code
+@field si_errno An errno value
+@field si_pid Sending process ID
+@field si_uid Real user ID of sending process
+@field si_utime User time consumed
+@field si_stime System time consumed
+@field si_addr Memory location which caused fault
+@field si_status Exit value or signal
+@field si_band Band event (Linux only)
+*/
+
+static int
+luxio_sigwaitinfo(lua_State *L)
+{
+ luxio_signalset *s = luaL_checkudata(L, 1, LUXIO_SIGNALSET_METATABLE);
+ siginfo_t info;
+
+ if (sigwaitinfo(&s->set, &info) == -1) {
+ lua_pushnil(L);
+ } else {
+ luxio__push_siginfo_table(L, &info);
+ }
+
+ lua_pushinteger(L, errno);
+ return 2;
+}
+
+/*** Suspend execution of process for a given time period
+or until signal is delivered.
+
+Linux only.
+
+sigtimedwait behaves exactly as sigwaitinfo but will suspend execution
+for a given time period specified by the (seconds, nanoseconds) arguments.
+If both of the (seconds, nanoseconds) arguments are 0 then the function
+polls for pending signals rather than suspending execution until a signal
+becomes pending. On success a signal info table for the pending signal
+is returned, otherwise nil is returned and errno is set accordingly.
+
+@tparam set set of signals to wait on
+@tparam number seconds
+@tparam number nanoseconds
+@treturn sigwaitinfo-table|nil signal info table, or nil on error
+@treturn errno
+@function sigtimedwait
+*/
+
+static int
+luxio_sigtimedwait(lua_State *L)
+{
+ luxio_signalset *s = luaL_checkudata(L, 1, LUXIO_SIGNALSET_METATABLE);
+ siginfo_t info;
+ time_t tv_secs = luaL_checkinteger(L, 2);
+ long tv_nsec = luaL_checkinteger(L, 3);
+ struct timespec timeout = { tv_secs, tv_nsec };
+
+ if (sigtimedwait(&s->set, &info, &timeout) == -1) {
+ lua_pushnil(L);
+ } else {
+ luxio__push_siginfo_table(L, &info);
+ }
+
+ lua_pushinteger(L, errno);
+ return 2;
+}
+#endif
+
/* TODO: sigqueue() 3.3.9 */
/* TODO: pthread_kill() 3.3.10 */
@@ -3829,6 +4022,7 @@ luxio_gai_strerror(lua_State *L)
@tparam[opt=AF_UNSPEC] number ai_family
@tparam[opt=0] number ai_socktype
@tparam[opt=0] number ai_protocol
+@treturn number return value
@treturn errno|table table of result `addrinfo` entries
@function getaddrinfo
*/
@@ -5025,7 +5219,15 @@ luxio_functions[] = {
{ "sigaction", luxio_sigaction },
{ "sigprocmask", luxio_sigprocmask },
+ { "sigpending", luxio_sigpending },
+ { "sigsuspend", luxio_sigsuspend },
+ { "sigwait", luxio_sigwait },
+#ifdef __linux__
+ { "sigwaitinfo", luxio_sigwaitinfo },
+ { "sigtimedwait", luxio_sigtimedwait },
+#endif
+ { "raise", luxio_raise },
{ "alarm", luxio_alarm },
{ "pause", luxio_pause },
{ "sleep", luxio_sleep },
diff --git a/tests/test-sigpending.lua b/tests/test-sigpending.lua
new file mode 100644
index 0000000..43136b1
--- /dev/null
+++ b/tests/test-sigpending.lua
@@ -0,0 +1,17 @@
+local l = require "luxio"
+
+s = l.newsigset()
+l.sigemptyset(s)
+l.sigaddset(s, l.SIGUSR1)
+l.sigprocmask(l.SIG_BLOCK, s)
+l.raise(l.SIGUSR1)
+
+pending = l.sigpending()
+
+present, errno = l.sigismember(pending, l.SIGUSR1)
+
+if present == 1 then
+ print("PASS")
+else
+ print("FAIL")
+end
diff --git a/tests/test-sigsuspend.lua b/tests/test-sigsuspend.lua
new file mode 100644
index 0000000..5c85e77
--- /dev/null
+++ b/tests/test-sigsuspend.lua
@@ -0,0 +1,15 @@
+local l = require "luxio"
+
+function handler()
+ return
+end
+
+l.sigaction(l.SIGINT, {["sa_handler"] = handler})
+
+s = l.newsigset()
+l.sigfillset(s)
+l.sigdelset(s, l.SIGINT)
+print("Press CTRL-C...")
+l.sigsuspend(s)
+
+print("PASS")
diff --git a/tests/test-sigtimedwait.lua b/tests/test-sigtimedwait.lua
new file mode 100644
index 0000000..0311a50
--- /dev/null
+++ b/tests/test-sigtimedwait.lua
@@ -0,0 +1,37 @@
+local l = require "luxio"
+
+function handler()
+ return
+end
+
+l.sigaction(l.SIGINT, {["sa_handler"] = handler})
+
+s = l.newsigset()
+l.sigemptyset(s)
+l.sigaddset(s, l.SIGINT)
+
+info, errno = l.sigtimedwait(s, 0, 0)
+
+if not (info == nil and errno == l.EAGAIN) then
+ print("FAIL")
+end
+
+print("Wait...")
+pid, errno = l.fork()
+if pid == 0 then
+ l.sleep(5)
+ print("Press CTRL-C...")
+ os.exit(0)
+elseif pid == -1 then
+ io.stderr:write(("fork: %s\n"):format(l.strerror(errno)))
+ os.exit(2)
+end
+
+seconds = 3600
+info, errno = l.sigtimedwait(s, seconds, 0)
+
+if info ~= nil and info["si_signo"] == l.SIGINT then
+ print("PASS")
+else
+ print(("FAIL (expected sig to be %d but it is %d)"):format(l.SIGINT,
info["si_signo"]))
+end
diff --git a/tests/test-sigwait.lua b/tests/test-sigwait.lua
new file mode 100644
index 0000000..bbd2378
--- /dev/null
+++ b/tests/test-sigwait.lua
@@ -0,0 +1,21 @@
+local l = require "luxio"
+
+function handler()
+ return
+end
+
+l.sigaction(l.SIGINT, {["sa_handler"] = handler})
+
+s = l.newsigset()
+l.sigemptyset(s)
+l.sigaddset(s, l.SIGINT)
+print("Press CTRL-C...")
+
+
+sig, errno = l.sigwait(s, l.SIGINT)
+
+if sig == l.SIGINT then
+ print("PASS")
+else
+ print(("FAIL (expected sig to be %d but it is %d)"):format(l.SIGINT, sig))
+end
diff --git a/tests/test-sigwaitinfo.lua b/tests/test-sigwaitinfo.lua
new file mode 100644
index 0000000..242b444
--- /dev/null
+++ b/tests/test-sigwaitinfo.lua
@@ -0,0 +1,21 @@
+local l = require "luxio"
+
+function handler()
+ return
+end
+
+l.sigaction(l.SIGINT, {["sa_handler"] = handler})
+
+s = l.newsigset()
+l.sigemptyset(s)
+l.sigaddset(s, l.SIGINT)
+print("Press CTRL-C...")
+
+
+info, errno = l.sigwaitinfo(s)
+
+if info ~= nil and info["si_signo"] == l.SIGINT then
+ print("PASS")
+else
+ print(("FAIL (expected sig to be %d but it is %d)"):format(l.SIGINT,
info["si_signo"]))
+end
--
2.11.0
7:28 a.m.
New subject: [PATCH 4/4] Add license statements
---
Makefile | 1 +
findlua.mk | 1 +
luxio_constants.inc.in | 1 +
tests/test-access.lua | 1 +
tests/test-creat.lua | 1 +
tests/test-dirent.lua | 1 +
tests/test-event-serv.lua | 1 +
tests/test-fcntl-lock-1.lua | 1 +
tests/test-fcntl-lock-2.lua | 1 +
tests/test-forkexecpwaitpid.lua | 1 +
tests/test-forkexecwaitpid.lua | 1 +
tests/test-http-client.lua | 1 +
tests/test-iconv.lua | 1 +
tests/test-mqueue-read.lua | 1 +
tests/test-mqueue-write.lua | 1 +
tests/test-poll-serv.lua | 1 +
tests/test-select.lua | 1 +
tests/test-setsid.lua | 1 +
tests/test-sigaction.lua | 1 +
tests/test-sigpending.lua | 1 +
tests/test-sigprocmask.lua | 1 +
tests/test-sigsuspend.lua | 1 +
tests/test-sigtimedwait.lua | 1 +
tests/test-sigwait.lua | 1 +
tests/test-sigwaitinfo.lua | 1 +
tests/test-sio-http-client.lua | 1 +
tests/test-splice.lua | 1 +
tests/test-subprocess.lua | 1 +
tests/test-sysconf.lua | 1 +
tests/test-syslog.lua | 1 +
tests/test-termident.lua | 1 +
tests/test-uds-server.lua | 1 +
32 files changed, 32 insertions(+)
diff --git a/Makefile b/Makefile
index a4965d2..0b883a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+# See LICENSE file for copyright and license details.
PREFIX ?= /usr
CP := cp -r
RM := rm -rf
diff --git a/findlua.mk b/findlua.mk
index 83d15cd..d0f64a4 100644
--- a/findlua.mk
+++ b/findlua.mk
@@ -1,3 +1,4 @@
+# See LICENSE file for copyright and license details.
ifeq ($(strip $(shell which pkg-config > /dev/null || echo NONE)),NONE)
$(error This makefile requires pkg-config)
endif
diff --git a/luxio_constants.inc.in b/luxio_constants.inc.in
index 9cd058f..83e1bb9 100644
--- a/luxio_constants.inc.in
+++ b/luxio_constants.inc.in
@@ -1,3 +1,4 @@
+/* See LICENSE file for copyright and license details. */
/* preprocessed by a script. First character handles processing:
*
* ? E(FOO) -> #ifdef FOO\nE(FOO)\n#endif
diff --git a/tests/test-access.lua b/tests/test-access.lua
index 0e6ab69..1afa71e 100644
--- a/tests/test-access.lua
+++ b/tests/test-access.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
local sio = require "luxio.simple"
diff --git a/tests/test-creat.lua b/tests/test-creat.lua
index 432788b..0c553e5 100644
--- a/tests/test-creat.lua
+++ b/tests/test-creat.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
local sio = require "luxio.simple"
diff --git a/tests/test-dirent.lua b/tests/test-dirent.lua
index 5f54099..6b3d0c7 100644
--- a/tests/test-dirent.lua
+++ b/tests/test-dirent.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
l = require "luxio"
dirp = l.opendir(arg[1] or ".")
diff --git a/tests/test-event-serv.lua b/tests/test-event-serv.lua
index 83b9101..13559d7 100644
--- a/tests/test-event-serv.lua
+++ b/tests/test-event-serv.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local ev = require 'luxio.event'
local sio = require 'luxio.simple'
diff --git a/tests/test-fcntl-lock-1.lua b/tests/test-fcntl-lock-1.lua
index a221b98..cb2493e 100644
--- a/tests/test-fcntl-lock-1.lua
+++ b/tests/test-fcntl-lock-1.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
local fd, r, errno
diff --git a/tests/test-fcntl-lock-2.lua b/tests/test-fcntl-lock-2.lua
index 3a6dbd1..c5df7c4 100644
--- a/tests/test-fcntl-lock-2.lua
+++ b/tests/test-fcntl-lock-2.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
local fd, r, errno
diff --git a/tests/test-forkexecpwaitpid.lua b/tests/test-forkexecpwaitpid.lua
index b5362df..98e2e0c 100644
--- a/tests/test-forkexecpwaitpid.lua
+++ b/tests/test-forkexecpwaitpid.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
local child = l.fork()
diff --git a/tests/test-forkexecwaitpid.lua b/tests/test-forkexecwaitpid.lua
index ab10ec6..02abef0 100644
--- a/tests/test-forkexecwaitpid.lua
+++ b/tests/test-forkexecwaitpid.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
local child = l.fork()
diff --git a/tests/test-http-client.lua b/tests/test-http-client.lua
index 7d0e095..447799c 100644
--- a/tests/test-http-client.lua
+++ b/tests/test-http-client.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
l = require "luxio"
local req = "GET / HTTP/1.1\r\nHost: www.rjek.com\r\nConnection:
close\r\n\r\n"
diff --git a/tests/test-iconv.lua b/tests/test-iconv.lua
index 6a14ac1..ea622f2 100644
--- a/tests/test-iconv.lua
+++ b/tests/test-iconv.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
luxio = require 'luxio'
cd = luxio.iconv_open("UTF-8", "ISO-8859-1")
diff --git a/tests/test-mqueue-read.lua b/tests/test-mqueue-read.lua
index d8aeb90..3c4b9a0 100644
--- a/tests/test-mqueue-read.lua
+++ b/tests/test-mqueue-read.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
l = require "luxio"
s = require "luxio.simple"
diff --git a/tests/test-mqueue-write.lua b/tests/test-mqueue-write.lua
index 42eff87..37bb032 100644
--- a/tests/test-mqueue-write.lua
+++ b/tests/test-mqueue-write.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
l = require "luxio"
s = require "luxio.simple"
diff --git a/tests/test-poll-serv.lua b/tests/test-poll-serv.lua
index a3c7ed7..b52f895 100644
--- a/tests/test-poll-serv.lua
+++ b/tests/test-poll-serv.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
local serv = l.socket(l.AF_INET, l.SOCK_STREAM, 0)
diff --git a/tests/test-select.lua b/tests/test-select.lua
index 4d810ba..8658668 100644
--- a/tests/test-select.lua
+++ b/tests/test-select.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
-- e.g. lua tests/test-select.lua <(while :; do echo hello; sleep 1; done) <(while
:; do echo world; sleep 1; done)
local l = require "luxio"
diff --git a/tests/test-setsid.lua b/tests/test-setsid.lua
index c720bd6..0c4c74a 100755
--- a/tests/test-setsid.lua
+++ b/tests/test-setsid.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
local child = l.fork()
diff --git a/tests/test-sigaction.lua b/tests/test-sigaction.lua
index 8f2e312..7bebcb7 100644
--- a/tests/test-sigaction.lua
+++ b/tests/test-sigaction.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local os = require "os"
local l = require "luxio"
local io = require "io"
diff --git a/tests/test-sigpending.lua b/tests/test-sigpending.lua
index 43136b1..8725891 100644
--- a/tests/test-sigpending.lua
+++ b/tests/test-sigpending.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
s = l.newsigset()
diff --git a/tests/test-sigprocmask.lua b/tests/test-sigprocmask.lua
index 490672b..7f1769f 100644
--- a/tests/test-sigprocmask.lua
+++ b/tests/test-sigprocmask.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
set = l.newsigset()
diff --git a/tests/test-sigsuspend.lua b/tests/test-sigsuspend.lua
index 5c85e77..60c1acb 100644
--- a/tests/test-sigsuspend.lua
+++ b/tests/test-sigsuspend.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
function handler()
diff --git a/tests/test-sigtimedwait.lua b/tests/test-sigtimedwait.lua
index 0311a50..549c107 100644
--- a/tests/test-sigtimedwait.lua
+++ b/tests/test-sigtimedwait.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
function handler()
diff --git a/tests/test-sigwait.lua b/tests/test-sigwait.lua
index bbd2378..1fd2f83 100644
--- a/tests/test-sigwait.lua
+++ b/tests/test-sigwait.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
function handler()
diff --git a/tests/test-sigwaitinfo.lua b/tests/test-sigwaitinfo.lua
index 242b444..aadc571 100644
--- a/tests/test-sigwaitinfo.lua
+++ b/tests/test-sigwaitinfo.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
function handler()
diff --git a/tests/test-sio-http-client.lua b/tests/test-sio-http-client.lua
index 18279ea..21d0034 100644
--- a/tests/test-sio-http-client.lua
+++ b/tests/test-sio-http-client.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local sio = require "luxio.simple"
sock = assert(sio.connect("www.rjek.com", "http"))
diff --git a/tests/test-splice.lua b/tests/test-splice.lua
index 2f434c4..c550336 100644
--- a/tests/test-splice.lua
+++ b/tests/test-splice.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
function check(r, e, ...)
diff --git a/tests/test-subprocess.lua b/tests/test-subprocess.lua
index 06f7757..6fac8a9 100644
--- a/tests/test-subprocess.lua
+++ b/tests/test-subprocess.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
sp = require 'luxio.subprocess'
proc = sp.spawn_simple {
diff --git a/tests/test-sysconf.lua b/tests/test-sysconf.lua
index cba7f1e..2a442bb 100644
--- a/tests/test-sysconf.lua
+++ b/tests/test-sysconf.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
local io = require "io"
diff --git a/tests/test-syslog.lua b/tests/test-syslog.lua
index c5d2c98..e826066 100644
--- a/tests/test-syslog.lua
+++ b/tests/test-syslog.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
local l = require "luxio"
math.randomseed(os.time())
diff --git a/tests/test-termident.lua b/tests/test-termident.lua
index 5cde143..0ecb5e7 100644
--- a/tests/test-termident.lua
+++ b/tests/test-termident.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
l = require "luxio"
print("ctermid()", l.ctermid())
diff --git a/tests/test-uds-server.lua b/tests/test-uds-server.lua
index a34cda1..5677f71 100644
--- a/tests/test-uds-server.lua
+++ b/tests/test-uds-server.lua
@@ -1,3 +1,4 @@
+-- See LICENSE file for copyright and license details.
l = require "luxio"
sock = l.socket(l.AF_UNIX, l.SOCK_DGRAM, 0)
--
2.11.0
5:22 p.m.
On Fri, Oct 04, 2019 at 23:28:46 +0100, Richard Ipsum wrote:
I've made all new error numbers conditional and rebased on top of
the new
master.
Looks good to me.
I apologise for my unresponsiveness over the past couple of weeks, I've been
away at conferences etc.
Merged and pushed.
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
1448
days inactive
1450
days old
5 comments
2 participants
participants (2)
-
Daniel Silverstone -
Richard Ipsum