Fixed loading files using relative names (closes #829, #830).

Author: pkulchenko

build/win32_starter.c

@@ -149,18 +149,26 @@ int WINAPI WinMain(HINSTANCE hInstance,  HINSTANCE hPrevInstance,  LPSTR lpCmdLi
 
   if (!GetFullPathName(argv[0],MAX_PATH,buffer,&file)) {
     MessageBox(NULL,
-      TEXT("Couldn't find the correct working directory"),
+      TEXT("Couldn't find the executable path"),
       TEXT("Failed to start editor"),
       MB_OK|MB_ICONERROR);
     return 0;
   }
   if (file!=NULL) *file = 0; // finish the string, don't need the appname
 
+  LPWSTR path = (LPWSTR)GlobalAlloc(GMEM_FIXED, MAX_PATH+1);
+  if (GetCurrentDirectoryW(MAX_PATH, path) == 0) {
+    MessageBox(NULL,
+      TEXT("Couldn't find the current working directory"),
+      TEXT("Failed to start editor"),
+      MB_OK|MB_ICONERROR);
+    return 0;
+  }
+
   SetCurrentDirectory(buffer);
 
   hinstLib = LoadLibrary(".\\bin\\lua51.dll");
-  if (hinstLib != NULL)
-  {
+  if (hinstLib != NULL) {
     luaL_newstate = (voidfunc*) GetProcAddress(hinstLib, "luaL_newstate");
     luaL_loadbuffer = (varfunc*) GetProcAddress(hinstLib, "luaL_loadbuffer");
     luaL_openlibs = (varfunc*) GetProcAddress(hinstLib, "luaL_openlibs");
@@ -182,13 +190,19 @@ int WINAPI WinMain(HINSTANCE hInstance,  HINSTANCE hPrevInstance,  LPSTR lpCmdLi
       // of the whole process, it SHOULD be pretty unlikely to fail here
       // but don't come back on me if it does...
       void *L = luaL_newstate();
-      int i;
 
       if (L!=NULL) {
-        lua_createtable(L,argc,0);
-        for (i=0;i<argc;i++) {
+        int i;
+        lua_createtable(L,argc+2,0);
+        lua_pushstring(L,argv[0]); // executable name goes first
+        lua_rawseti(L,-2,1);
+        lua_pushstring(L,"-cwd");
+        lua_rawseti(L,-2,2);
+        lua_pushstring(L,WideCharToUTF8(path));
+        lua_rawseti(L,-2,3);
+        for (i=1;i<argc;i++) {
           lua_pushstring(L,argv[i]);
-          lua_rawseti(L,-2,i+1);
+          lua_rawseti(L,-2,i+3);
         }
         lua_setfield(L,LUA_GLOBALSINDEX,"_ARG");
         luaL_openlibs(L);

src/editor/singleinstance.lua

@@ -69,21 +69,16 @@ else -- something different is running on our port
       ide:Print(("Another instance is running under user '%s' and can't be activated. This instance will continue running, which may cause interference with the debugger."):format(username))
     else
       local failed = false
-      for index = 2, #arg do
-        local fileName = arg[index]
-        if fileName ~= "--"
-        -- on OSX, the command line includes -psn parameter, so ignore it
-        and (ide.osname ~= 'Macintosh' or not fileName:find("^-psn")) then
-          cln:send(protocol.client.requestloading:format(fileName))
+      for _, filename in ipairs(ide.filenames) do
+        cln:send(protocol.client.requestloading:format(ide:MergePath(ide.cwd or "", filename)))
 
-          local msg, err = cln:receive()
-          if msg ~= protocol.server.answerok then
-            failed = true
-            ide:Print(err,msg)
-          end
+        local msg, err = cln:receive()
+        if msg ~= protocol.server.answerok then
+          failed = true
+          ide:Print(err,msg)
         end
       end
-      if #arg == 1 then -- no files are being loaded; just active the IDE
+      if #ide.filenames == 0 then -- no files are being loaded; just active the IDE
         cln:send(protocol.client.show)
         if cln:receive() ~= protocol.server.answerok then failed = true end
       end

src/main.lua

@@ -71,6 +71,7 @@ ide = {
   onidle = {},
 
   proto = {}, -- prototypes for various classes
+  filenames = {}, -- names for files to load
 
   app = nil, -- application engine
   interpreter = nil, -- current Lua interpreter
@@ -335,7 +336,6 @@ ide.test.setLuaPaths = setLuaPaths
 
 ---------------
 -- process args
-local filenames = {}
 local configs = {}
 do
   -- application parameters are passed as script parameters on Windows
@@ -365,10 +365,12 @@ do
   for index = 2, #arg do
     if (arg[index] == "-cfg" and index+1 <= #arg) then
       table.insert(configs,arg[index+1])
-    elseif arg[index-1] ~= "-cfg"
+    elseif (arg[index] == "-cwd" and index+1 <= #arg) then
+      ide.cwd = arg[index+1]
+    elseif arg[index-1] ~= "-cfg" and arg[index-1] ~= "-cwd"
     -- on OSX command line includes -psn... parameter, don't include these
     and (ide.osname ~= 'Macintosh' or not arg[index]:find("^-psn")) then
-      table.insert(filenames,arg[index])
+      table.insert(ide.filenames,arg[index])
     end
   end
 
@@ -598,8 +600,8 @@ SettingsRestoreView()
 -- Load the filenames
 
 do
-  for _, filename in ipairs(filenames) do
-    if filename ~= "--" then ide:ActivateFile(filename) end
+  for _, filename in ipairs(ide.filenames) do
+    ide:ActivateFile(ide:MergePath(ide.cwd or "", filename))
   end
   if ide:GetEditorNotebook():GetPageCount() == 0 then NewFile() end
 end

zbstudio.exe

@@ -1,20 +1,20 @@
 #!/bin/bash
 
-# Thanks to StackOverflow wiki (http://stackoverflow.com/a/246128)
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # per http://stackoverflow.com/a/246128
+CWD="$PWD" # save the current directory, as it's going to change
 
 if [[ $(uname) == "Darwin" ]]; then
   # MacOS Sierra throws `error -10810` running with quarantined files even when explicitly allowed
   ATTR="com.apple.quarantine"
   (cd "$DIR"; \
    if [[ $( xattr -pl $ATTR zbstudio 2>&1 ) == $ATTR:* ]]; then xattr -rd $ATTR zbstudio bin; fi; \
-   open zbstudio/ZeroBraneStudio.app --args "$@")
+   open zbstudio/ZeroBraneStudio.app --args -cwd "$CWD" "$@")
 else
   case "$(uname -m)" in
     x86_64)  ARCH=x64;;
     armv7l)  ARCH=armhf;;
     aarch64) ARCH=aarch64;;
     *)       ARCH=x86;;
   esac
-  (cd "$DIR"; bin/linux/$ARCH/lua src/main.lua zbstudio "$@") &
+  (cd "$DIR"; bin/linux/$ARCH/lua src/main.lua zbstudio -cwd "$CWD" "$@") &
 fi