From 65c35845c54c7f84b1cf5b0e3d4c7bbdaf1014e3 Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Tue, 14 Jun 2005 04:29:23 +0000 Subject: Working on the manual. --- src/ftp.lua | 2 +- src/http.lua | 4 ++-- src/inet.c | 24 ++++++++++++++---------- src/ltn12.lua | 2 +- src/luasocket.c | 4 ++-- src/mime.lua | 3 +-- src/smtp.lua | 4 ++-- src/socket.lua | 3 +-- src/tp.lua | 2 +- src/url.lua | 2 +- 10 files changed, 26 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/ftp.lua b/src/ftp.lua index a793298..841df5f 100644 --- a/src/ftp.lua +++ b/src/ftp.lua @@ -8,7 +8,7 @@ ----------------------------------------------------------------------------- -- Declare module and import dependencies ----------------------------------------------------------------------------- -local base = require("base") +local base = _G local table = require("table") local string = require("string") local math = require("math") diff --git a/src/http.lua b/src/http.lua index 669f54d..1a7b101 100644 --- a/src/http.lua +++ b/src/http.lua @@ -13,7 +13,7 @@ local url = require("socket.url") local ltn12 = require("ltn12") local mime = require("mime") local string = require("string") -local base = require("base") +local base = _G local table = require("table") module("socket.http") @@ -25,7 +25,7 @@ TIMEOUT = 60 -- default port for document retrieval PORT = 80 -- user agent field sent in request -USERAGENT = socket.VERSION +USERAGENT = socket._VERSION ----------------------------------------------------------------------------- -- Extra sources and sinks diff --git a/src/inet.c b/src/inet.c index d713643..d102060 100644 --- a/src/inet.c +++ b/src/inet.c @@ -172,21 +172,25 @@ static void inet_pushresolved(lua_State *L, struct hostent *hp) i = 1; alias = hp->h_aliases; lua_newtable(L); - while (*alias) { - lua_pushnumber(L, i); - lua_pushstring(L, *alias); - lua_settable(L, -3); - i++; alias++; + if (alias) { + while (*alias) { + lua_pushnumber(L, i); + lua_pushstring(L, *alias); + lua_settable(L, -3); + i++; alias++; + } } lua_settable(L, resolved); i = 1; lua_newtable(L); addr = (struct in_addr **) hp->h_addr_list; - while (*addr) { - lua_pushnumber(L, i); - lua_pushstring(L, inet_ntoa(**addr)); - lua_settable(L, -3); - i++; addr++; + if (addr) { + while (*addr) { + lua_pushnumber(L, i); + lua_pushstring(L, inet_ntoa(**addr)); + lua_settable(L, -3); + i++; addr++; + } } lua_settable(L, resolved); } diff --git a/src/ltn12.lua b/src/ltn12.lua index 1acb9b1..fbc9dce 100644 --- a/src/ltn12.lua +++ b/src/ltn12.lua @@ -10,7 +10,7 @@ ----------------------------------------------------------------------------- local string = require("string") local table = require("table") -local base = require("base") +local base = _G module("ltn12") filter = {} diff --git a/src/luasocket.c b/src/luasocket.c index 8f13dbc..2c3b526 100644 --- a/src/luasocket.c +++ b/src/luasocket.c @@ -89,12 +89,12 @@ static int base_open(lua_State *L) { /* export functions (and leave namespace table on top of stack) */ luaL_openlib(L, "socket", func, 0); #ifdef LUASOCKET_DEBUG - lua_pushstring(L, "DEBUG"); + lua_pushstring(L, "_DEBUG"); lua_pushboolean(L, 1); lua_rawset(L, -3); #endif /* make version string available to scripts */ - lua_pushstring(L, "VERSION"); + lua_pushstring(L, "_VERSION"); lua_pushstring(L, LUASOCKET_VERSION); lua_rawset(L, -3); return 1; diff --git a/src/mime.lua b/src/mime.lua index 6ef82b8..f6509a0 100644 --- a/src/mime.lua +++ b/src/mime.lua @@ -8,8 +8,7 @@ ----------------------------------------------------------------------------- -- Declare module and import dependencies ----------------------------------------------------------------------------- -package.loaded.base = _G -local base = require("base") +local base = _G local ltn12 = require("ltn12") local mime = require("cmime") module("mime") diff --git a/src/smtp.lua b/src/smtp.lua index 944a40f..6850f7f 100644 --- a/src/smtp.lua +++ b/src/smtp.lua @@ -8,7 +8,7 @@ ----------------------------------------------------------------------------- -- Declare module and import dependencies ----------------------------------------------------------------------------- -local base = require("base") +local base = _G local coroutine = require("coroutine") local string = require("string") local math = require("math") @@ -216,7 +216,7 @@ local function adjust_headers(mesgt) end lower["date"] = lower["date"] or os.date("!%a, %d %b %Y %H:%M:%S ") .. (mesgt.zone or ZONE) - lower["x-mailer"] = lower["x-mailer"] or socket.VERSION + lower["x-mailer"] = lower["x-mailer"] or socket._VERSION -- this can't be overriden lower["mime-version"] = "1.0" mesgt.headers = lower diff --git a/src/socket.lua b/src/socket.lua index 9a523fe..d1c7846 100644 --- a/src/socket.lua +++ b/src/socket.lua @@ -7,8 +7,7 @@ ----------------------------------------------------------------------------- -- Declare module and import dependencies ----------------------------------------------------------------------------- -package.loaded.base = _G -local base = require("base") +local base = _G local string = require("string") local math = require("math") local socket = require("csocket") diff --git a/src/tp.lua b/src/tp.lua index 1adc656..c51d123 100644 --- a/src/tp.lua +++ b/src/tp.lua @@ -8,7 +8,7 @@ ----------------------------------------------------------------------------- -- Declare module and import dependencies ----------------------------------------------------------------------------- -local base = require("base") +local base = _G local string = require("string") local socket = require("socket") local ltn12 = require("ltn12") diff --git a/src/url.lua b/src/url.lua index f29ecc8..0db111b 100644 --- a/src/url.lua +++ b/src/url.lua @@ -9,7 +9,7 @@ -- Declare module ----------------------------------------------------------------------------- local string = require("string") -local base = require("base") +local base = _G local table = require("table") module("socket.url") -- cgit v1.2.3-55-g6feb