Merge pull request #235 from fiendish/development

Development

MUSHclient/AardwolfPackageChanges.txt

@@ -1,5 +1,14 @@
 Aardwolf Client Package Major Changes List
 
+r1860 snapshot:
+- misc change: updated to MUSHclient 5.01 (see release notes http://www.mushclient.com/scripts/showrelnote.php )
+- new feature: ascii map plugin will only automatically request updates if the player is active so they shouldn't keep you from idling out.
+- new feature: mapper backups internally store the date and time of when they were created.
+- bug fix/misc change: luasec replaced by lua-openssl, because luasec was not thread-safe. This should solve some hangs/crashes. Hopefully this doesn't cause other SSL connectivity regressions for anyone. (updater)
+- misc change: remove some plugins that are distributed with MUSHclient by default that I consider harmful to the package.
+- bug fix: replace old code.google.com links in the new connection plugin.
+- comment: I have the nagging feeling that I've forgotten to include something in this release, but I don't know what.
+
 r1851 snapshot:
 - bug fix: Windows XP returns error 1026 if an FO_DELETE operation is attempted for a file that doesn't exist (updater)
 - bug fix: string comparisons should be plain (updater)

MUSHclient/locale/Localize_template.lua

@@ -1,6 +1,6 @@
 -- MUSHclient localization file
 
--- Written: Friday, 28 August 2015 at 15:12:30
+-- Written: Friday, 05 February 2016 at 15:40:36
 
 -- Static messages
 
@@ -1040,11 +1040,11 @@ messages = {
   ["Ready"] =
     "",
 
--- /cygdrive/c/source/mushclient/doc_construct.cpp:791
+-- /cygdrive/c/source/mushclient/doc_construct.cpp:793
   ["Your world name cannot be blank."] =
     "",
 
--- /cygdrive/c/source/mushclient/doc_construct.cpp:797
+-- /cygdrive/c/source/mushclient/doc_construct.cpp:799
   ["The world TCP/IP address cannot be blank."] =
     "",
 
@@ -1742,7 +1742,7 @@ messages = {
   ["Never"] =
     "",
 
--- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:734
+-- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:735
   ["Loading plugins ..."] =
     "",
   } -- end messages
@@ -5181,46 +5181,46 @@ formatted = {
       return ""
     end,  -- function
 
--- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:613
+-- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:614
   ["Line %4i: %s (%s)%s"] =
     function (a, b, c, d)
 
       return ""
     end,  -- function
 
--- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:667
+-- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:668
   ["Attribute not used: %s=\"%s\""] =
     function (a, b)
 
       return ""
     end,  -- function
 
--- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:683
+-- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:684
   ["Tag not used: <%s>"] =
     function (a)
 
       return ""
     end,  -- function
 
--- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:751
+-- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:752
   ["Loading plugin: %s"] =
     function (a)
 
       return ""
     end,  -- function
 
--- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:1047
+-- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:1048
 
--- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:1113
+-- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:1114
 
--- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:1144
+-- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:1145
   ["option '%s' not set"] =
     function (a)
 
       return ""
     end,  -- function
 
--- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:2417
+-- /cygdrive/c/source/mushclient/xml/xml_load_world.cpp:2418
   ["%s loading plugin %s ..."] =
     function (a, b)
 

MUSHclient/lua/aard_lua_ffi.lua

@@ -193,6 +193,11 @@ local function RestrictPathScope(path)
       path, num = path:gsub("\\\\", "\\")
    until num == 0
 
+   local firstchar = string.sub(original_path,1,1)
+   if firstchar == "\\" or firstchar == "/" then
+      path = "\\"..path -- put UNC code back
+   end
+
    local mushclient_canonical_path = ffi_charstr(1024, 0)
    if not PathCanonicalizeA(mushclient_canonical_path, GetInfo(66)) then -- GetInfo is a MUSHclient API call
       CheckForWinError(ffi.C.GetLastError())
@@ -302,5 +307,6 @@ aard_lua_ffi = {
    MoveFile = MoveFile, -- (source, destination, acceptable_errors)
    CreateDirectory = CreateDirectory, -- (path_to_create, recursive, acceptable_errors)
    DeleteFile = DeleteFile, -- (path_name, recursive, acceptable_errors)
+   RestrictPathScope = RestrictPathScope
 }
 

MUSHclient/lua/async.lua

@@ -1,5 +1,7 @@
 module("async", package.seeall)
 local _llthreads = require("llthreads")
+require "socket.http" -- just make sure they can load
+require "ssl.https" -- just make sure they can load
 
 local thread_pool = {}
 local request_urls = {}
@@ -8,8 +10,11 @@ local result_callbacks = {}
 local timeout_callbacks = {}
 local timeouts = {}
 
+-- This is really the function you should use instead of calling request directly.
 -- result_callback_function gets arguments (retval, page, status, headers, full_status, requested_url)
 -- callback_on_timeout function gets arguments (requested_url, timeout_after)
+-- request_protocol is either HTTP or HTTPS
+-- timeout_after is in seconds
 function doAsyncRemoteRequest(request_url, result_callback_function, request_protocol, timeout_after, callback_on_timeout)
    if request_protocol == nil then
       request_protocol = "HTTPS"