Merge pull request #47 from dualface/fix_luasocket_problems

fix luasocket_scripts.c problems

Author: minggo

lua/luasocket/luasocket_scripts.c

@@ -352,7 +352,7 @@ static const char *lua_m_mime =
 "\n"
 "encodet['quoted-printable'] = function(mode)\n"
 "    return ltn12.filter.cycle(_M.qp, \"\",\n"
-"        (mode == \"binary\") and \"=0D=0A\" or \"\r\n\")\n"
+"        (mode == \"binary\") and \"=0D=0A\" or \"\\r\\n\")\n"
 "end\n"
 "\n"
 "-- define the decoding filters\n"
@@ -508,7 +508,7 @@ static const char *lua_m_socket_ftp =
 "    if self.pasvt then self:pasvconnect() end\n"
 "    -- get the transfer argument and command\n"
 "    local argument = sendt.argument or\n"
-"        url.unescape(string.gsub(sendt.path or \"\", \"^[/\\]\", \"\"))\n"
+"        url.unescape(string.gsub(sendt.path or \"\", \"^[/\\\\]\", \"\"))\n"
 "    if argument == \"\" then argument = nil end\n"
 "    local command = sendt.command or \"stor\"\n"
 "    -- send the transfer command and check the reply\n"
@@ -542,7 +542,7 @@ static const char *lua_m_socket_ftp =
 "    self.try(self.pasvt or self.server, \"need port or pasv first\")\n"
 "    if self.pasvt then self:pasvconnect() end\n"
 "    local argument = recvt.argument or\n"
-"        url.unescape(string.gsub(recvt.path or \"\", \"^[/\\]\", \"\"))\n"
+"        url.unescape(string.gsub(recvt.path or \"\", \"^[/\\\\]\", \"\"))\n"
 "    if argument == \"\" then argument = nil end\n"
 "    local command = recvt.command or \"retr\"\n"
 "    self.try(self.tp:command(command, argument))\n"
@@ -895,9 +895,9 @@ static const char *lua_m_socket_http =
 "        dirty = function() return sock:dirty() end\n"
 "    }, {\n"
 "        __call = function(self, chunk, err)\n"
-"            if not chunk then return sock:send(\"0\r\n\r\n\") end\n"
-"            local size = string.format(\"%X\r\n\", string.len(chunk))\n"
-"            return sock:send(size ..  chunk .. \"\r\n\")\n"
+"            if not chunk then return sock:send(\"0\\r\\n\\r\\n\") end\n"
+"            local size = string.format(\"%X\\r\\n\", string.len(chunk))\n"
+"            return sock:send(size ..  chunk .. \"\\r\\n\")\n"
 "        end\n"
 "    })\n"
 "end\n"
@@ -921,15 +921,15 @@ static const char *lua_m_socket_http =
 "end\n"
 "\n"
 "function metat.__index:sendrequestline(method, uri)\n"
-"    local reqline = string.format(\"%s %s HTTP/1.1\r\n\", method or \"GET\", uri)\n"
+"    local reqline = string.format(\"%s %s HTTP/1.1\\r\\n\", method or \"GET\", uri)\n"
 "    return self.try(self.c:send(reqline))\n"
 "end\n"
 "\n"
 "function metat.__index:sendheaders(tosend)\n"
 "    local canonic = headers.canonic\n"
-"    local h = \"\r\n\"\n"
+"    local h = \"\\r\\n\"\n"
 "    for f, v in base.pairs(tosend) do\n"
-"        h = (canonic[f] or f) .. \": \" .. v .. \"\r\n\" .. h\n"
+"        h = (canonic[f] or f) .. \": \" .. v .. \"\\r\\n\" .. h\n"
 "    end\n"
 "    self.try(self.c:send(h))\n"
 "    return 1\n"
@@ -1165,11 +1165,11 @@ static const char *lua_m_socket_mbox =
 "\n"
 "function _M.split_message(message_s)\n"
 "    local message = {}\n"
-"    message_s = string.gsub(message_s, \"\r\n\", \"\n\")\n"
-"    string.gsub(message_s, \"^(.-\n)\n\", function (h) message.headers = h end)\n"
-"    string.gsub(message_s, \"^.-\n\n(.*)\", function (b) message.body = b end)\n"
+"    message_s = string.gsub(message_s, \"\\r\\n\", \"\\n\")\n"
+"    string.gsub(message_s, \"^(.-\\n)\\n\", function (h) message.headers = h end)\n"
+"    string.gsub(message_s, \"^.-\\n\\n(.*)\", function (b) message.body = b end)\n"
 "    if not message.body then\n"
-"        string.gsub(message_s, \"^\n(.*)\", function (b) message.body = b end)\n"
+"        string.gsub(message_s, \"^\\n(.*)\", function (b) message.body = b end)\n"
 "    end\n"
 "    if not message.headers and not message.body then\n"
 "        message.headers = message_s\n"
@@ -1179,15 +1179,15 @@ static const char *lua_m_socket_mbox =
 "\n"
 "function _M.split_headers(headers_s)\n"
 "    local headers = {}\n"
-"    headers_s = string.gsub(headers_s, \"\r\n\", \"\n\")\n"
-"    headers_s = string.gsub(headers_s, \"\n[ ]+\", \" \")\n"
-"    string.gsub(\"\n\" .. headers_s, \"\n([^\n]+)\", function (h) table.insert(headers, h) end)\n"
+"    headers_s = string.gsub(headers_s, \"\\r\\n\", \"\\n\")\n"
+"    headers_s = string.gsub(headers_s, \"\\n[ ]+\", \" \")\n"
+"    string.gsub(\"\\n\" .. headers_s, \"\\n([^\\n]+)\", function (h) table.insert(headers, h) end)\n"
 "    return headers\n"
 "end\n"
 "\n"
 "function _M.parse_header(header_s)\n"
-"    header_s = string.gsub(header_s, \"\n[ ]+\", \" \")\n"
-"    header_s = string.gsub(header_s, \"\n+\", \"\")\n"
+"    header_s = string.gsub(header_s, \"\\n[ ]+\", \" \")\n"
+"    header_s = string.gsub(header_s, \"\\n+\", \"\")\n"
 "    local _, __, name, value = string.find(header_s, \"([^%s:]-):%s*(.*)\")\n"
 "    return name, value\n"
 "end\n"
@@ -1221,10 +1221,10 @@ static const char *lua_m_socket_mbox =
 "\n"
 "function _M.split_mbox(mbox_s)\n"
 "    mbox = {}\n"
-"    mbox_s = string.gsub(mbox_s, \"\r\n\", \"\n\") ..\"\n\nFrom \n\"\n"
+"    mbox_s = string.gsub(mbox_s, \"\\r\\n\", \"\\n\") ..\"\\n\\nFrom \\n\"\n"
 "    local nj, i, j = 1, 1, 1\n"
 "    while 1 do\n"
-"        i, nj = string.find(mbox_s, \"\n\nFrom .-\n\", j)\n"
+"        i, nj = string.find(mbox_s, \"\\n\\nFrom .-\\n\", j)\n"
 "        if not i then break end\n"
 "        local message = string.sub(mbox_s, j, i-1)\n"
 "        table.insert(mbox, message)\n"
@@ -1316,7 +1316,7 @@ static const char *lua_m_socket_smtp =
 "    self.try(self.tp:command(\"DATA\"))\n"
 "    self.try(self.tp:check(\"3..\"))\n"
 "    self.try(self.tp:source(src, step))\n"
-"    self.try(self.tp:send(\"\r\n.\r\n\"))\n"
+"    self.try(self.tp:send(\"\\r\\n.\\r\\n\"))\n"
 "    return self.try(self.tp:check(\"2..\"))\n"
 "end\n"
 "\n"
@@ -1332,23 +1332,23 @@ static const char *lua_m_socket_smtp =
 "function metat.__index:login(user, password)\n"
 "    self.try(self.tp:command(\"AUTH\", \"LOGIN\"))\n"
 "    self.try(self.tp:check(\"3..\"))\n"
-"    self.try(self.tp:send(mime.b64(user) .. \"\r\n\"))\n"
+"    self.try(self.tp:send(mime.b64(user) .. \"\\r\\n\"))\n"
 "    self.try(self.tp:check(\"3..\"))\n"
-"    self.try(self.tp:send(mime.b64(password) .. \"\r\n\"))\n"
+"    self.try(self.tp:send(mime.b64(password) .. \"\\r\\n\"))\n"
 "    return self.try(self.tp:check(\"2..\"))\n"
 "end\n"
 "\n"
 "function metat.__index:plain(user, password)\n"
-"    local auth = \"PLAIN \" .. mime.b64(\"\0\" .. user .. \"\0\" .. password)\n"
+"    local auth = \"PLAIN \" .. mime.b64(\"\\0\" .. user .. \"\\0\" .. password)\n"
 "    self.try(self.tp:command(\"AUTH\", auth))\n"
 "    return self.try(self.tp:check(\"2..\"))\n"
 "end\n"
 "\n"
 "function metat.__index:auth(user, password, ext)\n"
 "    if not user or not password then return 1 end\n"
-"    if string.find(ext, \"AUTH[^\n]+LOGIN\") then\n"
+"    if string.find(ext, \"AUTH[^\\n]+LOGIN\") then\n"
 "        return self:login(user, password)\n"
-"    elseif string.find(ext, \"AUTH[^\n]+PLAIN\") then\n"
+"    elseif string.find(ext, \"AUTH[^\\n]+PLAIN\") then\n"
 "        return self:plain(user, password)\n"
 "    else\n"
 "        self.try(nil, \"authentication not supported\")\n"
@@ -1405,9 +1405,9 @@ static const char *lua_m_socket_smtp =
 "-- yield the headers all at once, it's faster\n"
 "local function send_headers(tosend)\n"
 "    local canonic = headers.canonic\n"
-"    local h = \"\r\n\"\n"
+"    local h = \"\\r\\n\"\n"
 "    for f,v in base.pairs(tosend) do\n"
-"        h = (canonic[f] or f) .. ': ' .. v .. \"\r\n\" .. h\n"
+"        h = (canonic[f] or f) .. ': ' .. v .. \"\\r\\n\" .. h\n"
 "    end\n"
 "    coroutine.yield(h)\n"
 "end\n"
@@ -1424,19 +1424,19 @@ static const char *lua_m_socket_smtp =
 "    -- send preamble\n"
 "    if mesgt.body.preamble then\n"
 "        coroutine.yield(mesgt.body.preamble)\n"
-"        coroutine.yield(\"\r\n\")\n"
+"        coroutine.yield(\"\\r\\n\")\n"
 "    end\n"
 "    -- send each part separated by a boundary\n"
 "    for i, m in base.ipairs(mesgt.body) do\n"
-"        coroutine.yield(\"\r\n--\" .. bd .. \"\r\n\")\n"
+"        coroutine.yield(\"\\r\\n--\" .. bd .. \"\\r\\n\")\n"
 "        send_message(m)\n"
 "    end\n"
 "    -- send last boundary\n"
-"    coroutine.yield(\"\r\n--\" .. bd .. \"--\r\n\r\n\")\n"
+"    coroutine.yield(\"\\r\\n--\" .. bd .. \"--\\r\\n\\r\\n\")\n"
 "    -- send epilogue\n"
 "    if mesgt.body.epilogue then\n"
 "        coroutine.yield(mesgt.body.epilogue)\n"
-"        coroutine.yield(\"\r\n\")\n"
+"        coroutine.yield(\"\\r\\n\")\n"
 "    end\n"
 "end\n"
 "\n"
@@ -1551,7 +1551,7 @@ static const char *lua_m_socket_tp =
 "            line, err = c:receive()\n"
 "            if err then return nil, err end\n"
 "            current, sep = socket.skip(2, string.find(line, \"^(%d%d%d)(.?)\"))\n"
-"            reply = reply .. \"\n\" .. line\n"
+"            reply = reply .. \"\\n\" .. line\n"
 "        -- reply ends with same code\n"
 "        until code == current and sep == \" \"\n"
 "    end\n"
@@ -1582,9 +1582,9 @@ static const char *lua_m_socket_tp =
 "function metat.__index:command(cmd, arg)\n"
 "    cmd = string.upper(cmd)\n"
 "    if arg then\n"
-"        return self.c:send(cmd .. \" \" .. arg.. \"\r\n\")\n"
+"        return self.c:send(cmd .. \" \" .. arg.. \"\\r\\n\")\n"
 "    else\n"
-"        return self.c:send(cmd .. \"\r\n\")\n"
+"        return self.c:send(cmd .. \"\\r\\n\")\n"
 "    end\n"
 "end\n"
 "\n"

lua/luasocket/luasocket_scripts.h

@@ -1,8 +1,8 @@
 
 /* luasocket_scripts.h.h */
 
-#ifndef __LUA_MODULES_7381EB5AEEAEA2DF0F25EF8827143F4A_H_
-#define __LUA_MODULES_7381EB5AEEAEA2DF0F25EF8827143F4A_H_
+#ifndef __LUA_MODULES_606BA1C00D116CA81B695C141D124DB7_H_
+#define __LUA_MODULES_606BA1C00D116CA81B695C141D124DB7_H_
 
 #if __cplusplus
 extern "C" {
@@ -29,4 +29,4 @@ int luaopen_lua_m_socket(lua_State* L);
 }
 #endif
 
-#endif /* __LUA_MODULES_7381EB5AEEAEA2DF0F25EF8827143F4A_H_ */
+#endif /* __LUA_MODULES_606BA1C00D116CA81B695C141D124DB7_H_ */