Changeset 555

Timestamp:

11/10/08 06:38:25 (5 years ago)

Author:

reyalp

Message:

+ add os.listdir to lua oslib, updated llibtst.lua

syntax t=os.listdir("name",[showall])
returns array of filenames, or nil, strerror, errno
if showall is true, t includes ".", ".." and deleted entries
NOTE except for the root directory, names ending in / will not work

Location:

trunk

Files:

• CHDK/SCRIPTS/TEST/llibtst.lua (modified) (3 diffs)
• doc/version.txt (modified) (1 diff)
• lib/lua/loslib.c (modified) (2 diffs)
• version.inc (modified) (1 diff)

trunk/CHDK/SCRIPTS/TEST/llibtst.lua

@@ -381 +381 @@
 end
 
+function tlistdir(name,showall)
+        log('os.listdir("',tostring(name),'",',tostring(showall),'): ')
+        local r,msg = os.listdir(name,showall)
+        if r then
+                logok()
+                log("{\n")
+                for k,v in ipairs(r) do
+                        log(' ',k,'="',tostring(v),'"\n')
+                end
+                log("}\n")
+        else
+                logfail(tostring(msg))
+        end
+        return r
+end
+
 function tutime(name,mtime,atime)
         log('os.utime("',tostring(name),'",',tostring(mtime),',',tostring(atime),'): ')
@@ -431 +447 @@
                 tstat(tdir0)
                 tren(tdir0..tdat0,tdir0..tdat1)
+                tlistdir(tdir0)
+                tlistdir(tdir0,true)
 -- NOTE invalid operations frequently leave the filesystem in a corrupt state
 --              trename(tdir0,tdir1)
@@ -436 +454 @@
                 trem(tdir0) --fail, not empty
                 trem("A/bogus") --fail missing
+                tlistdir("A/bogus") -- missing
+                tlistdir("A/llibtst.log") -- not a directory
                 tstat("A/bogus") -- fail missing
                 tutime("A/bogus") -- fail missing

trunk/doc/version.txt

@@ -2 +2 @@
 
 version / revision / author
+0.7.4 / #555 / reyalp
++ add os.listdir to lua oslib, updated llibtst.lua
+  syntax t=os.listdir("name",[showall])
+  returns array of filenames, or nil, strerror, errno
+  if showall is true, t includes ".", ".." and deleted entries
+  NOTE except for the root directory, names ending in / will not work
 
 0.7.3 / #554 / PhyrePhoX

trunk/lib/lua/loslib.c

@@ -247 +247 @@
   const char *dirname = luaL_checkstring(L, 1);
   return os_pushresult(L, mkdir(dirname) == 0, dirname);
+}
+
+/*
+  syntax
+    t=os.listdir("name",[showall])
+  returns array of filenames, or nil, strerror, errno
+  if showall is true, t includes ".", ".." and deleted entries
+  NOTE except for the root directory, names ending in / will not work
+*/
+static int os_listdir (lua_State *L) {
+  DIR *dir;
+  struct dirent *de;
+  const char *dirname = luaL_checkstring(L, 1);
+  int all=lua_toboolean(L, 2);
+  int i=1;
+  dir = opendir(dirname);
+  if(!dir) 
+    return os_pushresult(L, 0 , dirname);
+  lua_newtable(L); 
+  while((de = readdir(dir))) {
+        if(!all && (de->name[0] == 0xE5 || (strcmp(de->name,".")==0) || (strcmp(de->name,"..")==0)))
+      continue;
+        lua_pushinteger(L, i);
+        lua_pushstring(L, de->name);
+        lua_settable(L,-3);
+        ++i;
+  }
+  closedir(dir);
+  return 1;
 }
 
@@ -322 +351 @@
 #endif
   {"mkdir",     os_mkdir}, // reyalp - NOT STANDARD
+  {"listdir",   os_listdir}, // reyalp - NOT STANDARD
   {"stat",      os_stat}, // reyalp - NOT STANDARD
   {"utime",     os_utime}, // reyalp - NOT STANDARD

trunk/version.inc

@@ -1 @@
-BUILD_NUMBER := 0.7.3
+BUILD_NUMBER := 0.7.4