aboutsummaryrefslogtreecommitdiffstats
path: root/main/lua-pc/lpc-lua5.2-compat.patch
blob: 98ec7b1a588d9ff7639d8610f578e6e8ea409b9d (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
--- lpc-1.0.0.orig/Makefile
+++ lpc-1.0.0/Makefile
@@ -1,17 +1,24 @@
-LUA_PREFIX = /usr/local/
-PREFIX	= /usr/local/
+LUA_PKGCONF ?= lua
+
 MODULE = lpc
 VERSION = 1.0.0
 
-INSTALL_PREFIX = $(PREFIX)/lib/lua/5.1/
+ifneq ($(shell pkg-config $(LUA_PKGCONF) || echo not-installed),)
+$(error $(LUA_PKGCONF).pc not found)
+endif
 
+INSTALL_PREFIX = $(DESTDIR)$(shell pkg-config $(LUA_PKGCONF) --variable=INSTALL_CMOD)
+
 CC	= gcc
 TARGET	= lpc.so
 OBJS	= lpc.o
 LIBS	=
-CFLAGS	= -I $(LUA_PREFIX)/include -fPIC
+CFLAGS	= -fPIC
 LDFLAGS	= -shared -fPIC
 
+LUA_CFLAGS = $(shell pkg-config $(LUA_PKGCONF) --cflags)
+LUA_LDFLAGS = $(shell pkg-config $(LUA_PKGCONF) --libs)
+
 default: $(TARGET)
 
 
@@ -29,7 +36,7 @@
 	rm -rf $(MODULE)-$(VERSION)
 
 $(TARGET): $(OBJS)
-	$(CC) $(LDFLAGS) -o $(TARGET) $(OBJS)
+	$(CC) $(LUA_LDFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS)
 
 .c.o:
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(LUA_CFLAGS) $(CFLAGS) -c $< -o $@
--- lpc-1.0.0.orig/lpc.c
+++ lpc-1.0.0/lpc.c
@@ -1,7 +1,7 @@
 /*
 ** LuaProcessCall
 ** Copyright DarkGod 2007
-**
+** lua 5.1/5.2 compat (c) 2014 Timo Teräs
 */
 
 #include <errno.h>
@@ -15,47 +15,98 @@
 #include "lauxlib.h"
 #include "lualib.h"
 
-#define topfile(L)	((FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE))
+#if LUA_VERSION_NUM < 502
 
-static FILE *tofile (lua_State *L) {
-  FILE **f = topfile(L);
-  if (*f == NULL)
-    luaL_error(L, "attempt to use a closed file");
-  return *f;
+static int lua_absindex(lua_State *L, int idx) {
+	return (idx > 0 || idx <= LUA_REGISTRYINDEX)? idx : lua_gettop(L) + idx + 1;
+} /* lua_absindex() */
+
+static void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) {
+	int i, t = lua_absindex(L, -1 - nup);
+
+	for (; l->name; l++) {
+		for (i = 0; i < nup; i++)
+			lua_pushvalue(L, -nup);
+		lua_pushcclosure(L, l->func, nup);
+		lua_setfield(L, t, l->name);
+	}
+
+	lua_pop(L, nup);
+} /* luaL_setfuncs() */
+
+#define luaL_newlibtable(L, l) \
+	lua_createtable(L, 0, (sizeof (l) / sizeof *(l)) - 1)
+
+#define luaL_newlib(L, l) \
+	(luaL_newlibtable((L), (l)), luaL_setfuncs((L), (l), 0))
+
+#ifndef LUA_FILEHANDLE /* Not defined by earlier LuaJIT releases */
+#define LUA_FILEHANDLE "FILE*"
+#endif
+
+/*
+ * Lua 5.1 userdata is a simple FILE *, while LuaJIT is a struct with the
+ * first member a FILE *, similar to Lua 5.2.
+ */
+typedef struct luaL_Stream {
+	FILE *f;
+} luaL_Stream;
+
+static int luaL_fileresult(lua_State *L, int stat, const char *filename) {
+	int en = errno;  /* calls to Lua API may change this value */
+	if (stat) {
+		lua_pushboolean(L, 1);
+		return 1;
+	}
+	else {
+		lua_pushnil(L);
+		if (filename)
+			lua_pushfstring(L, "%s: %s", filename, strerror(en));
+		else
+			lua_pushfstring(L, "%s", strerror(en));
+		lua_pushinteger(L, en);
+		return 3;
+	}
 }
 
-static int pushresult (lua_State *L, int i, const char *filename) {
-  int en = errno;  /* calls to Lua API may change this value */
-  if (i) {
-    lua_pushboolean(L, 1);
-    return 1;
-  }
-  else {
-    lua_pushnil(L);
-    if (filename)
-      lua_pushfstring(L, "%s: %s", filename, strerror(en));
-    else
-      lua_pushfstring(L, "%s", strerror(en));
-    lua_pushinteger(L, en);
-    return 3;
-  }
+#define isclosed(p) ((p)->f == NULL)
+#define markclosed(p) ((p)->f = NULL)
+
+#else
+
+#define isclosed(p) ((p)->closef == NULL)
+#define markclosed(p) ((p)->closef = NULL)
+
+#endif
+
+#define tolstream(L) ((luaL_Stream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))
+
+static FILE *tofile (lua_State *L) {
+	luaL_Stream *p = tolstream(L);
+	if (isclosed(p))
+		luaL_error(L, "attempt to use a closed file");
+	return p->f;
 }
 
-static int io_fclose (lua_State *L) {
-  FILE **p = topfile(L);
-  int ok = (fclose(*p) == 0);
-  *p = NULL;
-  return pushresult(L, ok, NULL);
+static int io_fclose (lua_State *L)
+{
+	luaL_Stream *p = tolstream(L);
+	int res = fclose(p->f);
+	markclosed(p);
+	return luaL_fileresult(L, (res == 0), NULL);
 }
 
-static FILE **newfile_fd(lua_State *L, int fd, const char *mode)
+static luaL_Stream *newfile_fd(lua_State *L, int fd, const char *mode)
 {
-	FILE **pf = (FILE **)lua_newuserdata(L, sizeof(FILE *));
-	*pf = NULL;  /* file handle is currently `closed' */
+	luaL_Stream *p = (luaL_Stream *) lua_newuserdata(L, sizeof(luaL_Stream));
+	markclosed(p);
 	luaL_getmetatable(L, LUA_FILEHANDLE);
 	lua_setmetatable(L, -2);
-	*pf = fdopen(fd, mode);
-	return pf;
+	p->f = fdopen(fd, mode);
+#if LUA_VERSION_NUM >= 502
+	p->closef = &io_fclose;
+#endif
+	return p;
 }
 
 static int lpc_run(lua_State *L)
@@ -64,12 +115,12 @@
 	int p_in[2];
 	int pid;
 
-	if (pipe(p_out) == -1) { lua_pushnil(L); return 1; }
-	if (pipe(p_in) == -1)  { lua_pushnil(L); return 1; }
+	if (pipe(p_out) == -1)		goto err_noclose;
+	if (pipe(p_in) == -1)		goto err_closeout;
+	if ((pid = fork()) == -1)	goto err_closeinout;
 
-	if ((pid = fork()) == -1) { lua_pushnil(L); return 1; }
-	else if (pid == 0)
-	{
+	if (pid == 0) {
+		/* child */
 		char **args;
 		int n = lua_gettop(L);  /* number of arguments */
 		int i;
@@ -93,20 +144,24 @@
 		_exit(1);
 		return 0;
 	}
-	else
-	{
-		FILE **in;
-		FILE **out;
 
-		/* Cleanup */
-		close(p_out[0]);
-		close(p_in[1]);
+	/* Cleanup */
+	close(p_out[0]);
+	close(p_in[1]);
+	lua_pushnumber(L, pid);
+	newfile_fd(L, p_out[1], "w");
+	newfile_fd(L, p_in[0], "r");
+	return 3;
 
-		lua_pushnumber(L, pid);
-		out = newfile_fd(L, p_out[1], "w");
-		in = newfile_fd(L, p_in[0], "r");
-		return 3;
-	}
+err_closeinout:
+	close(p_in[0]);
+	close(p_in[1]);
+err_closeout:
+	close(p_out[0]);
+	close(p_out[1]);
+err_noclose:
+	lua_pushnil(L);
+	return 1;
 }
 
 static int lpc_wait(lua_State *L)
@@ -116,13 +171,9 @@
 	int nonblock = luaL_optinteger(L, 2, 0);
 
 	if (waitpid(pid, &ret, (nonblock == 1) ? WNOHANG : 0) == pid)
-	{
 		lua_pushnumber(L, ret);
-	}
 	else
-	{
 		lua_pushnil(L);
-	}
 	return 1;
 }
 
@@ -141,13 +192,9 @@
 	FD_SET(fileno(f), &rfds);
 	retval = select(1 + fileno(f), &rfds, NULL, NULL, &tv);
 	if (retval == 1)
-	{
 		lua_pushboolean(L, 1);
-	}
 	else
-	{
 		lua_pushnil(L);
-	}
 	return 1;
 }
 
@@ -166,13 +213,9 @@
 	FD_SET(fileno(f), &wfds);
 	retval = select(1 + fileno(f), NULL, &wfds, NULL, &tv);
 	if (retval == 1)
-	{
 		lua_pushboolean(L, 1);
-	}
 	else
-	{
 		lua_pushboolean(L, 0);
-	}
 	return 1;
 }
 
@@ -192,7 +235,7 @@
 	lua_settable (L, -3);
 }
 
-static const struct luaL_reg lpclib[] =
+static const struct luaL_Reg lpclib[] =
 {
 	{"run", lpc_run},
 	{"wait", lpc_wait},
@@ -207,15 +250,15 @@
 
 static void createmeta(lua_State *L)
 {
-  luaL_getmetatable(L, LUA_FILEHANDLE);  /* get IO's metatable for file handles */
-  luaL_register(L, NULL, io_add_flib);  /* file methods */
+	luaL_getmetatable(L, LUA_FILEHANDLE);  /* get IO's metatable for file handles */
+	luaL_setfuncs(L, io_add_flib, 0);  /* file methods */
 }
 
-
 int luaopen_lpc (lua_State *L)
 {
 	createmeta(L);
 
+#if LUA_VERSION_NUM < 502
 	luaL_openlib(L, "lpc", lpclib, 0);
 
 	/* create environment for 'run' */
@@ -225,6 +268,9 @@
 	lua_setfield(L, -2, "__close");
 	lua_setfenv(L, -2);
 	lua_pop(L, 1);  /* pop 'run' */
+#else
+	luaL_newlib(L, lpclib);
+#endif
 
 	set_info(L);
 	return 1;