zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/windows-install-fix into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/windows-install-fix/+merge/84151

fix for installing and using modules on windows
-- 
https://code.launchpad.net/~zorba-coders/zorba/windows-install-fix/+merge/84151
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/context/root_static_context.cpp'
--- src/context/root_static_context.cpp	2011-11-08 03:11:02 +0000
+++ src/context/root_static_context.cpp	2011-12-01 18:10:38 +0000
@@ -134,13 +134,17 @@
     char *last_slash = strrchr(dll_path, '\\');
     if(last_slash)
     {
-      last_slash[1] = 0;
-      zstring zorba_root_dir(dll_path);
+      last_slash[0] = 0;
+      last_slash = strrchr (dll_path, '\\');
+      if (last_slash) {
+        last_slash[1] = 0;
+        zstring zorba_root_dir(dll_path);
 
-      append_to_path(lRootURIPath, zorba_root_dir, zstring(ZORBA_CORE_URI_DIR));
-      append_to_path(lRootURIPath, zorba_root_dir, zstring(ZORBA_NONCORE_URI_DIR));
-      append_to_path(lRootLibPath, zorba_root_dir, zstring(ZORBA_CORE_LIB_DIR));
-      append_to_path(lRootLibPath, zorba_root_dir, zstring(ZORBA_NONCORE_LIB_DIR));
+        append_to_path(lRootURIPath, zorba_root_dir, zstring(ZORBA_CORE_URI_DIR));
+        append_to_path(lRootURIPath, zorba_root_dir, zstring(ZORBA_NONCORE_URI_DIR));
+        append_to_path(lRootLibPath, zorba_root_dir, zstring(ZORBA_CORE_LIB_DIR));
+        append_to_path(lRootLibPath, zorba_root_dir, zstring(ZORBA_NONCORE_LIB_DIR));
+      }
     }
   }
 #endif