Changeset 4887

Timestamp:

06/21/09 14:41:18 (4 years ago)

Author:

Cyrus

Message:

nixio: Resolve namespace clashes

Location:

luci/trunk/libs/nixio

Files:

• lua/nixio/fs.lua (modified) (9 diffs)
• src/fs.c (modified) (1 diff)

luci/trunk/libs/nixio/lua/nixio/fs.lua

@@ -67 +67 @@
 
 function copy(src, dest)
-    local stat, code, msg, res = nixio.lstat(src)
+    local stat, code, msg, res = nixio.fs.lstat(src)
     if not stat then
         return nil, code, msg
@@ -73 +73 @@
     
     if stat.type == "dir" then
-        if nixio.stat(dest, type) ~= "dir" then
-            res, code, msg = nixio.mkdir(dest)
+        if nixio.fs.stat(dest, type) ~= "dir" then
+            res, code, msg = nixio.fs.mkdir(dest)
         else
             stat = true
         end
     elseif stat.type == "lnk" then
-        res, code, msg = nixio.symlink(nixio.readlink(src), dest)
+        res, code, msg = nixio.fs.symlink(nixio.fs.readlink(src), dest)
     elseif stat.type == "reg" then
         res, code, msg = datacopy(src, dest)
@@ -88 +88 @@
     end
     
-    nixio.utimes(dest, stat.atime, stat.mtime)
+    nixio.fs.utimes(dest, stat.atime, stat.mtime)
     
-    if nixio.lchown then
-        nixio.lchown(dest, stat.uid, stat.gid)
+    if nixio.fs.lchown then
+        nixio.fs.lchown(dest, stat.uid, stat.gid)
     end
     
     if stat.type ~= "lnk" then
-        nixio.chmod(dest, stat.modedec)
+        nixio.fs.chmod(dest, stat.modedec)
     end
     
@@ -102 +102 @@
 
 function move(src, dest)
-    local stat, code, msg = nixio.rename(src, dest)
+    local stat, code, msg = nixio.fs.rename(src, dest)
     if not stat and code == nixio.const.EXDEV then
-        stat, code, msg = nixio.copy(src, dest)
+        stat, code, msg = copy(src, dest)
         if stat then
-            stat, code, msg = nixio.unlink(src)
+            stat, code, msg = nixio.fs.unlink(src)
         end
     end
@@ -113 +113 @@
 
 function mkdirr(dest, mode)
-    if nixio.stat(dest, "type") == "dir" then
+    if nixio.fs.stat(dest, "type") == "dir" then
         return true
     else
-        local stat, code, msg = nixio.mkdir(dest, mode)
+        local stat, code, msg = nixio.fs.mkdir(dest, mode)
         if not stat and code == nixio.const.ENOENT then
-            stat, code, msg = mkdirr(nixio.dirname(dest), mode)
+            stat, code, msg = mkdirr(nixio.fs.dirname(dest), mode)
             if stat then
-                stat, code, msg = nixio.mkdir(dest, mode)
+                stat, code, msg = nixio.fs.mkdir(dest, mode)
             end
         end
@@ -128 +128 @@
 
 local function _recurse(cb, src, dest)
-    local type = nixio.lstat(src, "type")
+    local type = nixio.fs.lstat(src, "type")
     if type ~= "dir" then
         return cb(src, dest)
@@ -138 +138 @@
         end
 
-        for e in nixio.dir(src) do
+        for e in nixio.fs.dir(src) do
             if dest then
                 s, c, m = _recurse(cb, src .. se .. e, dest .. se .. e)
@@ -161 +161 @@
 
 function mover(src, dest)
-    local stat, code, msg = nixio.rename(src, dest)
+    local stat, code, msg = nixio.fs.rename(src, dest)
     if not stat and code == nixio.const.EXDEV then
         stat, code, msg = _recurse(copy, src, dest)
         if stat then
-            stat, code, msg = _recurse(nixio.remove, src)
+            stat, code, msg = _recurse(nixio.fs.remove, src)
         end
     end
@@ -172 +172 @@
 
 function remover(src)
-    return _recurse(nixio.remove, src)
+    return _recurse(nixio.fs.remove, src)
 end

luci/trunk/libs/nixio/src/fs.c

@@ -255 +255 @@
 static int nixio_utimes(lua_State *L) {
     const char *path = luaL_checkstring(L, 1);
-    if (lua_gettop(L) < 2) {
+    if (lua_gettop(L) < 2 || (lua_isnoneornil(L, 2) && lua_isnoneornil(L, 3))) {
         return nixio__pstatus(L, !utimes(path, NULL));
     } else {