Gonna try my luck on windows...

1 files changed, 61 insertions, 61 deletions

diff --git a/src/unix.c b/src/unix.c
index 407f85d..1e0e252 100644
--- a/src/unix.c
+++ b/src/unix.c
@@ -33,11 +33,11 @@ static int meth_getfd(lua_State *L);
 static int meth_setfd(lua_State *L);
 static int meth_dirty(lua_State *L);
 
-static const char *unix_tryconnect(p_unix unix, const char *path);
-static const char *unix_trybind(p_unix unix, const char *path);
+static const char *unix_tryconnect(p_unix un, const char *path);
+static const char *unix_trybind(p_unix un, const char *path);
 
 /* unix object methods */
-static luaL_reg unix[] = {
+static luaL_reg un[] = {
     {"__gc",        meth_close},
     {"__tostring",  aux_tostring},
     {"accept",      meth_accept},
@@ -77,9 +77,9 @@ static luaL_reg func[] = {
 \*-------------------------------------------------------------------------*/
 int unix_open(lua_State *L) {
     /* create classes */
-    aux_newclass(L, "unix{master}", unix);
-    aux_newclass(L, "unix{client}", unix);
-    aux_newclass(L, "unix{server}", unix);
+    aux_newclass(L, "unix{master}", un);
+    aux_newclass(L, "unix{client}", un);
+    aux_newclass(L, "unix{server}", un);
     /* create class groups */
     aux_add2group(L, "unix{master}", "unix{any}");
     aux_add2group(L, "unix{client}", "unix{any}");
@@ -98,42 +98,42 @@ int unix_open(lua_State *L) {
 * Just call buffered IO methods
 \*-------------------------------------------------------------------------*/
 static int meth_send(lua_State *L) {
-    p_unix unix = (p_unix) aux_checkclass(L, "unix{client}", 1);
-    return buf_meth_send(L, &unix->buf);
+    p_unix un = (p_unix) aux_checkclass(L, "unix{client}", 1);
+    return buf_meth_send(L, &un->buf);
 }
 
 static int meth_receive(lua_State *L) {
-    p_unix unix = (p_unix) aux_checkclass(L, "unix{client}", 1);
-    return buf_meth_receive(L, &unix->buf);
+    p_unix un = (p_unix) aux_checkclass(L, "unix{client}", 1);
+    return buf_meth_receive(L, &un->buf);
 }
 
 /*-------------------------------------------------------------------------*\
 * Just call option handler
 \*-------------------------------------------------------------------------*/
 static int meth_setoption(lua_State *L) {
-    p_unix unix = (p_unix) aux_checkgroup(L, "unix{any}", 1);
-    return opt_meth_setoption(L, opt, &unix->sock);
+    p_unix un = (p_unix) aux_checkgroup(L, "unix{any}", 1);
+    return opt_meth_setoption(L, opt, &un->sock);
 }
 
 /*-------------------------------------------------------------------------*\
 * Select support methods
 \*-------------------------------------------------------------------------*/
 static int meth_getfd(lua_State *L) {
-    p_unix unix = (p_unix) aux_checkgroup(L, "unix{any}", 1);
-    lua_pushnumber(L, (int) unix->sock);
+    p_unix un = (p_unix) aux_checkgroup(L, "unix{any}", 1);
+    lua_pushnumber(L, (int) un->sock);
     return 1;
 }
 
 /* this is very dangerous, but can be handy for those that are brave enough */
 static int meth_setfd(lua_State *L) {
-    p_unix unix = (p_unix) aux_checkgroup(L, "unix{any}", 1);
-    unix->sock = (t_sock) luaL_checknumber(L, 2); 
+    p_unix un = (p_unix) aux_checkgroup(L, "unix{any}", 1);
+    un->sock = (t_sock) luaL_checknumber(L, 2); 
     return 0;
 }
 
 static int meth_dirty(lua_State *L) {
-    p_unix unix = (p_unix) aux_checkgroup(L, "unix{any}", 1);
-    lua_pushboolean(L, !buf_isempty(&unix->buf));
+    p_unix un = (p_unix) aux_checkgroup(L, "unix{any}", 1);
+    lua_pushboolean(L, !buf_isempty(&un->buf));
     return 1;
 }
 
@@ -145,22 +145,22 @@ static int meth_accept(lua_State *L) {
     p_unix server = (p_unix) aux_checkclass(L, "unix{server}", 1);
     p_tm tm = tm_markstart(&server->tm);
     t_sock sock;
-    const char *err = sock_accept(&server->sock, &sock, NULL, NULL, tm);
+    int err = sock_accept(&server->sock, &sock, NULL, NULL, tm);
     /* if successful, push client socket */
-    if (!err) {
+    if (err == IO_DONE) {
         p_unix clnt = (p_unix) lua_newuserdata(L, sizeof(t_unix));
         aux_setclass(L, "unix{client}", -1);
         /* initialize structure fields */
         sock_setnonblocking(&sock);
         clnt->sock = sock;
         io_init(&clnt->io, (p_send)sock_send, (p_recv)sock_recv, 
-                (p_geterr) sock_geterr, &clnt->sock);
+                (p_error) sock_ioerror, &clnt->sock);
         tm_init(&clnt->tm, -1, -1);
         buf_init(&clnt->buf, &clnt->io, &clnt->tm);
         return 1;
     } else {
         lua_pushnil(L); 
-        lua_pushstring(L, err);
+        lua_pushstring(L, sock_strerror(err));
         return 2;
     }
 }
@@ -168,10 +168,10 @@ static int meth_accept(lua_State *L) {
 /*-------------------------------------------------------------------------*\
 * Binds an object to an address 
 \*-------------------------------------------------------------------------*/
-static const char *unix_trybind(p_unix unix, const char *path) {
+static const char *unix_trybind(p_unix un, const char *path) {
     struct sockaddr_un local;
     size_t len = strlen(path);
-    const char *err;
+    int err;
     if (len >= sizeof(local.sun_path)) return "path too long";
     memset(&local, 0, sizeof(local));
     strcpy(local.sun_path, path);
@@ -179,20 +179,20 @@ static const char *unix_trybind(p_unix unix, const char *path) {
 #ifdef UNIX_HAS_SUN_LEN
     local.sun_len = sizeof(local.sun_family) + sizeof(local.sun_len) 
         + len + 1;
-    err = sock_bind(&unix->sock, (SA *) &local, local.sun_len);
+    err = sock_bind(&un->sock, (SA *) &local, local.sun_len);
 
 #else 
-    err = sock_bind(&unix->sock, (SA *) &local, 
+    err = sock_bind(&un->sock, (SA *) &local, 
             sizeof(local.sun_family) + len);
 #endif
-    if (err) sock_destroy(&unix->sock);
-    return err; 
+    if (err != IO_DONE) sock_destroy(&un->sock);
+    return sock_strerror(err); 
 }
 
 static int meth_bind(lua_State *L) {
-    p_unix unix = (p_unix) aux_checkclass(L, "unix{master}", 1);
+    p_unix un = (p_unix) aux_checkclass(L, "unix{master}", 1);
     const char *path =  luaL_checkstring(L, 2);
-    const char *err = unix_trybind(unix, path);
+    const char *err = unix_trybind(un, path);
     if (err) {
         lua_pushnil(L);
         lua_pushstring(L, err);
@@ -205,33 +205,33 @@ static int meth_bind(lua_State *L) {
 /*-------------------------------------------------------------------------*\
 * Turns a master unix object into a client object.
 \*-------------------------------------------------------------------------*/
-static const char *unix_tryconnect(p_unix unix, const char *path)
+static const char *unix_tryconnect(p_unix un, const char *path)
 {
     struct sockaddr_un remote;
-    const char *err;
+    int err;
     size_t len = strlen(path);
     if (len >= sizeof(remote.sun_path)) return "path too long";
     memset(&remote, 0, sizeof(remote));
     strcpy(remote.sun_path, path);
     remote.sun_family = AF_UNIX;
-    tm_markstart(&unix->tm);
+    tm_markstart(&un->tm);
 #ifdef UNIX_HAS_SUN_LEN
     remote.sun_len = sizeof(remote.sun_family) + sizeof(remote.sun_len) 
         + len + 1;
-    err = sock_connect(&unix->sock, (SA *) &remote, remote.sun_len, &unix->tm);
+    err = sock_connect(&un->sock, (SA *) &remote, remote.sun_len, &un->tm);
 #else
-    err = sock_connect(&unix->sock, (SA *) &remote, 
-            sizeof(remote.sun_family) + len, &unix->tm);
+    err = sock_connect(&un->sock, (SA *) &remote, 
+            sizeof(remote.sun_family) + len, &un->tm);
 #endif
-    if (err) sock_destroy(&unix->sock);
-    return err;
+    if (err != IO_DONE) sock_destroy(&un->sock);
+    return sock_strerror(err);
 }
 
 static int meth_connect(lua_State *L)
 {
-    p_unix unix = (p_unix) aux_checkclass(L, "unix{master}", 1);
+    p_unix un = (p_unix) aux_checkclass(L, "unix{master}", 1);
     const char *path =  luaL_checkstring(L, 2);
-    const char *err = unix_tryconnect(unix, path);
+    const char *err = unix_tryconnect(un, path);
     if (err) {
         lua_pushnil(L);
         lua_pushstring(L, err);
@@ -248,8 +248,8 @@ static int meth_connect(lua_State *L)
 \*-------------------------------------------------------------------------*/
 static int meth_close(lua_State *L)
 {
-    p_unix unix = (p_unix) aux_checkgroup(L, "unix{any}", 1);
-    sock_destroy(&unix->sock);
+    p_unix un = (p_unix) aux_checkgroup(L, "unix{any}", 1);
+    sock_destroy(&un->sock);
     return 0;
 }
 
@@ -258,12 +258,12 @@ static int meth_close(lua_State *L)
 \*-------------------------------------------------------------------------*/
 static int meth_listen(lua_State *L)
 {
-    p_unix unix = (p_unix) aux_checkclass(L, "unix{master}", 1);
+    p_unix un = (p_unix) aux_checkclass(L, "unix{master}", 1);
     int backlog = (int) luaL_optnumber(L, 2, 32);
-    const char *err = sock_listen(&unix->sock, backlog);
-    if (err) {
+    int err = sock_listen(&un->sock, backlog);
+    if (err != IO_DONE) {
         lua_pushnil(L);
-        lua_pushstring(L, err);
+        lua_pushstring(L, sock_strerror(err));
         return 2;
     }
     /* turn master object into a server object */
@@ -277,20 +277,20 @@ static int meth_listen(lua_State *L)
 \*-------------------------------------------------------------------------*/
 static int meth_shutdown(lua_State *L)
 {
-    p_unix unix = (p_unix) aux_checkgroup(L, "unix{client}", 1);
+    p_unix un = (p_unix) aux_checkgroup(L, "unix{client}", 1);
     const char *how = luaL_optstring(L, 2, "both");
     switch (how[0]) {
         case 'b':
             if (strcmp(how, "both")) goto error;
-            sock_shutdown(&unix->sock, 2);
+            sock_shutdown(&un->sock, 2);
             break;
         case 's':
             if (strcmp(how, "send")) goto error;
-            sock_shutdown(&unix->sock, 1);
+            sock_shutdown(&un->sock, 1);
             break;
         case 'r':
             if (strcmp(how, "receive")) goto error;
-            sock_shutdown(&unix->sock, 0);
+            sock_shutdown(&un->sock, 0);
             break;
     }
     lua_pushnumber(L, 1);
@@ -304,8 +304,8 @@ error:
 * Just call tm methods
 \*-------------------------------------------------------------------------*/
 static int meth_settimeout(lua_State *L) {
-    p_unix unix = (p_unix) aux_checkgroup(L, "unix{any}", 1);
-    return tm_meth_settimeout(L, &unix->tm);
+    p_unix un = (p_unix) aux_checkgroup(L, "unix{any}", 1);
+    return tm_meth_settimeout(L, &un->tm);
 }
 
 /*=========================================================================*\
@@ -316,24 +316,24 @@ static int meth_settimeout(lua_State *L) {
 \*-------------------------------------------------------------------------*/
 static int global_create(lua_State *L) {
     t_sock sock;
-    const char *err = sock_create(&sock, AF_UNIX, SOCK_STREAM, 0);
+    int err = sock_create(&sock, AF_UNIX, SOCK_STREAM, 0);
     /* try to allocate a system socket */
-    if (!err) { 
+    if (err == IO_DONE) { 
         /* allocate unix object */
-        p_unix unix = (p_unix) lua_newuserdata(L, sizeof(t_unix));
+        p_unix un = (p_unix) lua_newuserdata(L, sizeof(t_unix));
         /* set its type as master object */
         aux_setclass(L, "unix{master}", -1);
         /* initialize remaining structure fields */
         sock_setnonblocking(&sock);
-        unix->sock = sock;
-        io_init(&unix->io, (p_send) sock_send, (p_recv) sock_recv, 
-                (p_geterr) sock_geterr, &unix->sock);
-        tm_init(&unix->tm, -1, -1);
-        buf_init(&unix->buf, &unix->io, &unix->tm);
+        un->sock = sock;
+        io_init(&un->io, (p_send) sock_send, (p_recv) sock_recv, 
+                (p_error) sock_ioerror, &un->sock);
+        tm_init(&un->tm, -1, -1);
+        buf_init(&un->buf, &un->io, &un->tm);
         return 1;
     } else {
         lua_pushnil(L);
-        lua_pushstring(L, err);
+        lua_pushstring(L, sock_strerror(err));
         return 2;
     }
 }