Fixed smtp.lua loading.

Adjusted tftp module.
Added some comments.

3 files changed, 9 insertions, 5 deletions

diff --git a/test/stufftest.lua b/test/stufftest.lua
index 5eb8005..6bd1f91 100644
--- a/test/stufftest.lua
+++ b/test/stufftest.lua
@@ -1,11 +1,13 @@
+smtp = require("smtp")
+
 function test_dot(original, right)
-    local result, n = socket.smtp.dot(2, original)
+    local result, n = smtp.dot(2, original)
     assert(result == right, "->" .. result .. "<-")
     print("ok")
 end
 
 function test_stuff(original, right)
-    local result, n = socket.smtp.dot(2, original)
+    local result, n = smtp.dot(2, original)
     assert(result == right, "->" .. result .. "<-")
     print("ok")
 end
diff --git a/test/testmesg.lua b/test/testmesg.lua
index 449f4c2..3e4c28f 100644
--- a/test/testmesg.lua
+++ b/test/testmesg.lua
@@ -14,7 +14,7 @@ source = smtp.message{
   },
   body = {
     preamble = "If your client doesn't understand attachments, \r\n" ..
-               "it will still display the preamble and the epilogue.\r\n",
+               "it will still display the preamble and the epilogue.\r\n" ..
                "Preamble might show up even in a MIME enabled client.",
     -- first part: No headers means plain text, us-ascii.
     -- The mime.eol low-level filter normalizes end-of-line markers.
@@ -55,3 +55,5 @@ r, e = smtp.send{
     source = source,
     server = "mail.cs.princeton.edu"
 }
+
+print(r, e)
diff --git a/test/tftptest.lua b/test/tftptest.lua
index a478ed8..f0dbd82 100644
--- a/test/tftptest.lua
+++ b/test/tftptest.lua
@@ -1,5 +1,5 @@
 -- load tftpclnt.lua
-dofile("tftp.lua")
+local tftp = require("tftp")
 
 -- needs tftp server running on localhost, with root pointing to
 -- a directory with index.html in it
@@ -13,7 +13,7 @@ function readfile(file)
 end
 
 host = host or "localhost"
-retrieved, err = socket.tftp.get("tftp://" .. host .."/index.html")
+retrieved, err = tftp.get("tftp://" .. host .."/index.html")
 assert(not err, err)
 original = readfile("test/index.html")
 assert(original == retrieved, "files differ!")