Changeset 2248 for code/branches

Timestamp:

Nov 22, 2008, 10:25:45 PM (16 years ago)

Author:

rgrieder

Message:

• Bugfix in tolua.c: Paths like "D:\" weren't considered absolute paths.
• Bugfix in package.lua: Package file's relativity to working directory got forgotten.

Location:

code/branches/buildsystem/src/tolua

Files:

• lua/package.lua (modified) (1 diff)
• tolua.c (modified) (4 diffs)

code/branches/buildsystem/src/tolua/lua/package.lua

@@ -250 +250 @@
     -- open input file, if any
     if fn then
-        local st, msg = readfrom(flags.f)
+        local file
+        if flags.f then
+            if string.sub(flags.f, 1, 1) == '/' or string.sub(flags.f, 1, 1) == '\\' then
+                file = flags.f
+            else
+                file = flags.w..'/'..flags.f
+            end
+        else
+            file = flags.f
+        end
+        local st, msg = readfrom(file)
         if not st then
-            error('#'..msg)
+            error('#'..msg..' path: '..flags.f)
         end
         local _; _, _, ext = strfind(fn,".*%.(.*)$")

code/branches/buildsystem/src/tolua/tolua.c

@@ -86 +86 @@
 int main (int argc, char* argv[])
 {
+ char* working_directory = "";
+ char* lua_source = "";
+
  #ifdef LUA_VERSION_NUM /* lua 5.1 */
  lua_State* L = luaL_newstate();
@@ -102 +105 @@
  lua_pushstring(L,LUA_VERSION); lua_setglobal(L,"TOLUA_LUA_VERSION");
 
- char* working_directory = "";
- char* lua_source = "";
 
  if (argc==1)
@@ -163 +164 @@
   char path[BUFSIZ];
   char file[BUFSIZ];
-
-  if (lua_source[0] == '/' || lua_source[0] == '\\')
+  path[0] = '\0';
+  file[0] = '\0';
+
+  if (strlen(lua_source) > 0 &&
+      lua_source[0] != '/' &&
+      lua_source[0] != '\\' &&
+      strlen(lua_source) > 1 &&
+      lua_source[1] != ':')
   {
-   strcpy(path, lua_source);
-   char* p = strrchr(path, '/');
-   if (p == NULL)
-    p = strrchr(path, '\\');
-   p = (p == NULL) ? path : p + 1;
-   strcpy(file, p);
-   *p = '\0';
-  }
-  else
-  {
+   /* Relative path, prefix working directory */
    strcpy(path, working_directory);
-   strcpy(file, "all.lua");
-
+   /* Make sure there is '\\' or '/' at the end of the path */
    if (strlen(path) > 0)
    {
@@ -187 +184 @@
   }
 
+  strcat(path, lua_source);
+
+  /* Extract the full path */
+  {
+   char* p;
+   p = strrchr(path, '/');
+   if (p == NULL)
+    p = strrchr(path, '\\');
+   p = (p == NULL) ? path : p + 1;
+   strcpy(file, p);
+   *p = '\0';
+  }
+  if (strlen(file) == 0)
+   strcpy(file, "all.lua");
+
   lua_pushstring(L, path);
   lua_setglobal(L, "path");
   strcat(path, file);
+#ifdef LUA_VERSION_NUM /* lua 5.1 */
+  luaL_dofile(L, path);
+#else
   lua_dofile(L, path);
+#endif
  }
  return 0;