15 files changed, 100 insertions, 32 deletions

diff --git a/etc/check-links.lua b/etc/check-links.lua
index d2e4266..283f3ac 100644
--- a/etc/check-links.lua
+++ b/etc/check-links.lua
@@ -11,7 +11,7 @@ dispatch.TIMEOUT = 10
 
 -- make sure the user knows how to invoke us
 arg = arg or {}
-if table.getn(arg) < 1 then
+if #arg < 1 then
     print("Usage:\n  luasocket check-links.lua [-n] {<url>}")
     exit()
 end
diff --git a/etc/dispatch.lua b/etc/dispatch.lua
index cc8cb23..cab7f59 100644
--- a/etc/dispatch.lua
+++ b/etc/dispatch.lua
@@ -50,7 +50,7 @@ function socket.protect(f)
   return function(...)
     local co = coroutine.create(f)
     while true do
-      local results = {coroutine.resume(co, base.unpack(arg))}
+      local results = {coroutine.resume(co, ...)}
       local status = table.remove(results, 1)
       if not status then
         if base.type(results[1]) == 'table' then
@@ -76,7 +76,7 @@ local function newset()
         insert = function(set, value)
             if not reverse[value] then
                 table.insert(set, value)
-                reverse[value] = table.getn(set)
+                reverse[value] = #set
             end
         end,
         remove = function(set, value)
@@ -104,8 +104,7 @@ local function cowrap(dispatcher, tcp, error)
     -- don't override explicitly.
     local metat = { __index = function(table, key)
         table[key] = function(...)
-            arg[1] = tcp
-            return tcp[key](base.unpack(arg))
+            return tcp[key](tcp,select(2,...))
         end
         return table[key]
     end}
diff --git a/etc/forward.lua b/etc/forward.lua
index 9073ac4..05ced1a 100644
--- a/etc/forward.lua
+++ b/etc/forward.lua
@@ -3,7 +3,7 @@ local dispatch = require("dispatch")
 local handler = dispatch.newhandler()
 
 -- make sure the user knows how to invoke us
-if table.getn(arg) < 1 then
+if #arg < 1 then
     print("Usage")
     print("    lua forward.lua <iport:ohost:oport> ...")
     os.exit(1)
diff --git a/etc/get.lua b/etc/get.lua
index 4196f00..9edc235 100644
--- a/etc/get.lua
+++ b/etc/get.lua
@@ -135,7 +135,7 @@ end
 
 -- main program
 arg = arg or {}
-if table.getn(arg) < 1 then
+if #arg < 1 then
     io.write("Usage:\n  lua get.lua <remote-url> [<local-file>]\n")
     os.exit(1)
 else get(arg[1], arg[2]) end
diff --git a/ltn012.wiki b/ltn012.wiki
index b924dd3..96b13ae 100644
--- a/ltn012.wiki
+++ b/ltn012.wiki
@@ -126,8 +126,9 @@ local function chain2(f1, f2)
 end
 
 function filter.chain(...)
+    local arg = {...}
     local f = arg[1]
-    for i = 2, table.getn(arg) do
+    for i = 2, #arg do
         f = chain2(f, arg[i])
     end
     return f
@@ -235,9 +236,10 @@ end
 We can make these ideas even more powerful if we use a new feature of Lua 5.0: coroutines.  Coroutines suffer from a great lack of advertisement, and I am going to play my part here.  Just like lexical scoping, coroutines taste odd at first, but once you get used with the concept, it can save your day. I have to admit that using coroutines to implement our file source would be overkill, so let's implement a concatenated source factory instead.
         {{{
 function source.cat(...)
+    local arg = {...}
     local co = coroutine.create(function()
         local i = 1
-        while i <= table.getn(arg) do
+        while i <= #arg do
             local chunk, err = arg[i]()
             if chunk then coroutine.yield(chunk)
             elseif err then return nil, err 
diff --git a/ltn013.wiki b/ltn013.wiki
index 734b433..a622424 100644
--- a/ltn013.wiki
+++ b/ltn013.wiki
@@ -73,12 +73,12 @@ Fortunately, all these problems are very easy to solve and that's what we do in
 We used the {{pcall}} function to shield the user from errors that could be raised by the underlying implementation.  Instead of directly using {{pcall}} (and thus duplicating code) every time we prefer a factory that does the same job:
         {{{
 local function pack(ok, ...)
-    return ok, arg
+    return ok, {...}
 end
 
 function protect(f)
     return function(...)
-        local ok, ret = pack(pcall(f, unpack(arg)))
+        local ok, ret = pack(pcall(f, ...))
         if ok then return unpack(ret)
         else return nil, ret[1] end
     end
@@ -157,7 +157,7 @@ function newtry(f)
             if f then f() end 
             error(arg[2], 0)  
         else 
-            return unpack(arg) 
+            return ...
         end
     end
 end
diff --git a/luasocket-2.1-1.rockspec b/luasocket-2.1-1.rockspec
new file mode 100644
index 0000000..9c59abe
--- /dev/null
+++ b/luasocket-2.1-1.rockspec
@@ -0,0 +1,67 @@
+package = "LuaSocket"
+version = "2.1-1"
+source = {
+   url = "git://github.com/diegonehab/luasocket.git",
+   branch = "unstable"
+}
+description = {
+   summary = "Network support for the Lua language",
+   detailed = [[
+      LuaSocket is a Lua extension library that is composed by two parts: a C core
+      that provides support for the TCP and UDP transport layers, and a set of Lua
+      modules that add support for functionality commonly needed by applications
+      that deal with the Internet.
+   ]],
+   homepage = "http://luaforge.net/projects/luasocket/",
+   license = "MIT"
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   type = "make",
+   build_variables = {
+      PLAT="linux",
+      LUAINC_linux="$(LUA_INCDIR)"
+   },
+   install_variables = {
+      INSTALL_TOP_SHARE = "$(LUADIR)",
+      INSTALL_TOP_LIB = "$(LIBDIR)"
+   },
+   platforms = {
+      macosx = {
+         build_variables = {
+            PLAT="macosx",
+            LUAINC_macosx="$(LUA_INCDIR)"
+         }
+      },
+      windows={
+         type= "command",
+         build_command=
+            "set INCLUDE=$(LUA_INCDIR);%INCLUDE% &"..
+            "set LIB=$(LUA_LIBDIR);%LIB% &"..
+            "msbuild /p:\"VCBuildAdditionalOptions= /useenv\" luasocket.sln &"..
+            "mkdir mime & mkdir socket &"..
+            "cp src/mime.dll mime/core.dll &"..
+            "cp src/socket.dll socket/core.dll",
+         install= {
+            lib = {
+               ["mime.core"] = "mime/core.dll",
+               ["socket.core"] = "socket/core.dll"
+            },
+            lua = {
+               "src/ltn12.lua",
+               "src/mime.lua",
+               "src/socket.lua",
+               ["socket.headers"] = "src/headers.lua",
+               ["socket.ftp"] = "src/ftp.lua",
+               ["socket.http"] = "src/http.lua",
+               ["socket.smtp"] = "src/smtp.lua",
+               ["socket.tp"] = "src/tp.lua",
+               ["socket.url"] = "src/url.lua",               
+            }
+         }
+      }
+   },
+   copy_directories = { "doc", "samples", "etc", "test" }
+}
diff --git a/samples/lpr.lua b/samples/lpr.lua
index 2b059b1..49a1dfa 100644
--- a/samples/lpr.lua
+++ b/samples/lpr.lua
@@ -28,8 +28,8 @@ end
 
 do
     local opt = {}
-    local pat = "[%s%c%p]*([%w]*)=([\"]?[%w%s_!@#$%%^&*()<>:;]+[\"]\?\.?)"
-    for i = 2, table.getn(arg), 1 do
+    local pat = "[%s%c%p]*([%w]*)=([\"]?[%w%s_!@#$%%^&*()<>:;]+[\"]?.?)"
+    for i = 2, #arg, 1 do
       string.gsub(arg[i], pat, function(name, value) opt[name] = value end)
     end
     if not arg[2] then
diff --git a/samples/tinyirc.lua b/samples/tinyirc.lua
index e75851f..5babb7e 100644
--- a/samples/tinyirc.lua
+++ b/samples/tinyirc.lua
@@ -31,7 +31,7 @@ function newset()
         insert = function(set, value)
             if not reverse[value] then
                 table.insert(set, value)
-                reverse[value] = table.getn(set)
+                reverse[value] = #set
             end
         end,
         remove = function(set, value)
diff --git a/src/mbox.lua b/src/mbox.lua
index b7d4a2a..35adf4e 100644
--- a/src/mbox.lua
+++ b/src/mbox.lua
@@ -34,7 +34,7 @@ end
 function Public.parse_headers(headers_s)
     local headers_t = Public.split_headers(headers_s)
     local headers = {}
-    for i = 1, table.getn(headers_t) do
+    for i = 1, #headers_t do
         local name, value = Public.parse_header(headers_t[i])
         if name then
             name = string.lower(name)
@@ -74,7 +74,7 @@ end
 
 function Public.parse(mbox_s)
     local mbox = Public.split_mbox(mbox_s)
-    for i = 1, table.getn(mbox) do
+    for i = 1, #mbox do
         mbox[i] = Public.parse_message(mbox[i])
     end
     return mbox
diff --git a/src/url.lua b/src/url.lua
index 1bfecad..6ca6d68 100644
--- a/src/url.lua
+++ b/src/url.lua
@@ -259,7 +259,7 @@ function parse_path(path)
     path = path or ""
     --path = string.gsub(path, "%s", "")
     string.gsub(path, "([^/]+)", function (s) table.insert(parsed, s) end)
-    for i = 1, table.getn(parsed) do
+    for i = 1, #parsed do
         parsed[i] = unescape(parsed[i])
     end
     if string.sub(path, 1, 1) == "/" then parsed.is_absolute = 1 end
@@ -277,7 +277,7 @@ end
 -----------------------------------------------------------------------------
 function build_path(parsed, unsafe)
     local path = ""
-    local n = table.getn(parsed)
+    local n = #parsed
     if unsafe then
         for i = 1, n-1 do
             path = path .. parsed[i]
diff --git a/test/httptest.lua b/test/httptest.lua
index 614acf3..d5fbb37 100644
--- a/test/httptest.lua
+++ b/test/httptest.lua
@@ -66,7 +66,7 @@ local check_request = function(request, expect, ignore)
     local response = {}
     response.code, response.headers, response.status = 
         socket.skip(1, http.request(request))
-    if t and table.getn(t) > 0 then response.body = table.concat(t) end
+    if t and #t > 0 then response.body = table.concat(t) end
     check_result(response, expect, ignore)
 end
 
diff --git a/test/smtptest.lua b/test/smtptest.lua
index 5f0e0e5..b5380ff 100644
--- a/test/smtptest.lua
+++ b/test/smtptest.lua
@@ -20,7 +20,7 @@ dofile("testsupport.lua")
 
 local total = function()
     local t = 0
-    for i = 1, table.getn(sent) do
+    for i = 1, #sent do
         t = t + sent[i].count
     end
     return t
@@ -83,7 +83,7 @@ end
 
 local check = function(sent, m)
     io.write("checking ", m.headers.title, ": ")
-    for i = 1, table.getn(sent) do
+    for i = 1, #sent do
         local s = sent[i]
         if s.title == m.headers.title and s.count > 0 then
             check_headers(s.headers, m.headers)
@@ -98,7 +98,7 @@ end
 
 local insert = function(sent, message)
     if type(message.rcpt) == "table" then
-        message.count = table.getn(message.rcpt)
+        message.count = #message.rcpt
     else message.count = 1 end
     message.headers = message.headers or {}
     message.headers.title = message.title
@@ -115,7 +115,7 @@ local wait = function(sentinel, n)
     io.write("waiting for ", n, " messages: ")
     while 1 do
         local mbox = parse(get())
-        if n == table.getn(mbox) then break end
+        if n == #mbox then break end
         if socket.time() - sentinel.time > 50 then 
             to = 1 
             break
@@ -237,7 +237,7 @@ empty()
 print("ok")
 
 io.write("sending messages: ")
-for i = 1, table.getn(sent) do
+for i = 1, #sent do
     ret, err = socket.smtp.mail(sent[i])
     if not ret then fail(err) end
     io.write("+")
@@ -249,9 +249,9 @@ wait(mark(), total())
 
 io.write("parsing mailbox: ")
 local mbox = parse(get())
-print(table.getn(mbox) .. " messages found!")
+print(#mbox .. " messages found!")
 
-for i = 1, table.getn(mbox) do
+for i = 1, #mbox do
     check(sent, mbox[i])
 end
 
diff --git a/test/urltest.lua b/test/urltest.lua
index 71e4428..32cb348 100644
--- a/test/urltest.lua
+++ b/test/urltest.lua
@@ -34,7 +34,7 @@ end
 
 local check_parse_path = function(path, expect)
     local parsed = socket.url.parse_path(path)
-    for i = 1, math.max(table.getn(parsed), table.getn(expect)) do
+    for i = 1, math.max(#parsed, #expect) do
         if parsed[i] ~= expect[i] then
             print(path)
             os.exit()
diff --git a/test/utestclnt.lua b/test/utestclnt.lua
index eec6adc..01f55e5 100644
--- a/test/utestclnt.lua
+++ b/test/utestclnt.lua
@@ -4,24 +4,24 @@ local socket = require"socket.unix"
 host = "luasocket"
 
 function pass(...)
-    local s = string.format(unpack(arg))
+    local s = string.format(...)
     io.stderr:write(s, "\n")
 end
 
 function fail(...)
-    local s = string.format(unpack(arg))
+    local s = string.format(...)
     io.stderr:write("ERROR: ", s, "!\n")
 socket.sleep(3)
     os.exit()
 end
 
 function warn(...)
-    local s = string.format(unpack(arg))
+    local s = string.format(...)
     io.stderr:write("WARNING: ", s, "\n")
 end
 
 function remote(...)
-    local s = string.format(unpack(arg))
+    local s = string.format(...)
     s = string.gsub(s, "\n", ";")
     s = string.gsub(s, "%s+", " ")
     s = string.gsub(s, "^%s*", "")