Changeset 807

Timestamp:

01/16/10 00:15:46 (8 weeks ago)

Author:

ghoulsblade

Message:

bugfix in mkdir default permissions and linux ifdef, new lua utils : GetHomePath,CopyDir,CopyFile

Location:

trunk/lugre

Files:

• lua/lib.util.lua (modified) (1 diff)
• src/lugre_scripting.general.cpp (modified) (2 diffs)
• src/lugre_shell.cpp (modified) (1 diff)

trunk/lugre/lua/lib.util.lua

@@ -70 +70 @@
         fp:write(data)
         fp:close()
+end
+
+function CopyFile (src,dst) -- not tested with binary/nontext files, should work, but not sure yet
+        --~ print("CopyFile",src,dst)
+        local data = FileGetContents(src)
+        if (data) then FilePutContents(dst,data) end
+end
+function CopyDir (src,dst,bIncludeSpecial)
+        --~ print("CopyDir",src,dst)
+        assert(file_exists(dst))
+        for k,name in ipairs(dirlist(src,false,true)) do CopyFile(src..name,dst..name) end
+        for k,name in ipairs(dirlist(src,true,false)) do if (name ~= "." and name ~= ".." and (name ~= ".svn" or bIncludeSpecial)) then mkdir(dst..name) CopyDir(src..name.."/",dst..name.."/") end end
+end
+function GetHomePath () -- returns /home/username  without trailing slash
+        if (WIN32) then return end -- not yet implemented
+        local file = io.popen("echo $HOME")
+        if (not file) then return end -- popen or home dir not available
+        for line in file:lines() do file:close() return string.sub(line,1,-1) end -- remove newline
+        file:close()
 end
 

trunk/lugre/src/lugre_scripting.general.cpp

@@ -262 +262 @@
 
 // lua :  int   mkdir   (path,mode)             -- mode is ignored for win, 0x700 as default for linux (restrictive, only owner)
+//~ d--x--x--x   1+1*8+1*8*8
+//~ d-wx--x--x   3+3*8+3*8*8
+//~ drwxr-xr-x   7+7*8+7*8*8  
+//~ drwx------         7*8*8 = oct: 0700
+//~ d------r-x   7          
 static int l_mkdir (lua_State *L) { PROFILE
         std::string sPath = luaL_checkstring(L,1);
-        int iMode = cLuaBindDirectQuickWrapHelper::ParamIntDefault(L,2,0x700);
+        int iMode = cLuaBindDirectQuickWrapHelper::ParamIntDefault(L,2,0700);
         lua_pushnumber(L,rob_mkdir(sPath.c_str(),iMode));
         return 1;
@@ -285 +290 @@
         for (unsigned int i=0;i<res.size();++i) {
                 lua_pushstring( L, res[i].c_str() );
-                lua_rawseti( L, -2, i );
+                lua_rawseti( L, -2, i+1 ); // i+1 : lua indices start at 1
         }
         return 1;

trunk/lugre/src/lugre_shell.cpp

@@ -45 +45 @@
 
 int     rob_mkdir                       (const char* path,int perm) {
-        // found on http://www.devx.com/cplus/10MinuteSolution/26748/1954
-        #ifdef mkdir
-                #ifdef WIN32
-                return mkdir(path);
-                #else
-                return mkdir(path,(mode_t)perm);
-                #endif
+        // found on http://www.devx.com/cplus/10MinuteSolution/26748/1954   // perm ignored for win
+        //~ printf("rob_mkdir(%s,0x%x)\n",path,perm);
+        #ifdef WIN32
+        return mkdir(path); // simply comment out for win if it causes trouble during compile, currently (15.01.2010) only needed for iris install using home path
         #else
-                return -1;
+        return mkdir(path,(mode_t)perm);
         #endif
+        return -2;
 }
 
 int     rob_rmdir                       (const char* path) {
-        #ifdef rmdir
-                return rmdir(path);
+        #ifdef WIN32
+        return rmdir(path); // simply comment out for win if it causes trouble during compile, currently (15.01.2010) only needed for iris install using home path
         #else
-                return -1;
+        return rmdir(path);
         #endif
+        return -2;
 }