Imported a few extra functions from paths package.

2 files changed, 41 insertions, 3 deletions

diff --git a/sys.c b/sys.c
index 9c262a9..04acac2 100644
--- a/sys.c
+++ b/sys.c
@@ -14,6 +14,8 @@
 #include <time.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <dirent.h>
+#define NAMLEN(dirent) strlen((dirent)->d_name)
 
 #define SBINCREMENT 256
 
@@ -231,6 +233,25 @@ static int l_pwd(lua_State *L) {
   return sbpush(L, &sb);
 }
 
+static int l_dir(lua_State *L) {
+  int k = 0;
+  const char *s = luaL_checkstring(L, 1);
+  DIR *dirp;
+  struct dirent *d;
+  dirp = opendir(s);
+  if (dirp) {
+    lua_createtable(L, 0, 0);
+    while ((d = readdir(dirp))) {
+      int n = NAMLEN(d);
+      lua_pushlstring(L, d->d_name, n);
+      lua_rawseti(L, -2, ++k);
+    }
+    closedir(dirp);
+  } else
+    lua_pushnil(L);
+  return 1;
+}
+
 static int concat_fname(lua_State *L, const char *fname) {
   const char *from = lua_tostring(L, -1);
   const char *s;
@@ -293,6 +314,7 @@ static const struct luaL_reg routines [] = {
   {"dirname", l_dirname},
   {"basename", l_basename},
   {"concat", l_concat},
+  {"dir", l_dir},
   {"pwd", l_pwd},
   {NULL, NULL}
 };
diff --git a/sys.lua b/sys.lua
index 52375cd..9429e5c 100644
--- a/sys.lua
+++ b/sys.lua
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------
 --
--- Copyright (c) 2010 Clement Farabet
+-- Copyright (c) 2011 Clement Farabet
 -- 
 -- Permission is hereby granted, free of charge, to any person obtaining
 -- a copy of this software and associated documentation files (the
@@ -26,10 +26,10 @@
 --     sys - a package that provides simple system (unix) tools
 --
 -- ack:
---     the C lib was largely taken from Torch5
+--     the C lib was largely taken from Torch5 (code from Ronan)
 --
 -- history: 
---     March 27, 2011, 9:58PM - creation
+--     March 27, 2011, 9:58PM - creation - Clement Farabet
 ----------------------------------------------------------------------
 
 require 'os'
@@ -126,6 +126,22 @@ function sleep(seconds)
 end
 
 --------------------------------------------------------------------------------
+-- file iterator, in given path
+--------------------------------------------------------------------------------
+function files(path)
+   local d = dir(path)
+   local n = 0
+   return function()
+             n = n + 1
+             if (d and n <= #d) then
+                return d[n]
+             else
+                return nil
+             end
+          end
+end
+
+--------------------------------------------------------------------------------
 -- colors, can be used to print things in color
 --------------------------------------------------------------------------------
 COLORS = {none = '\27[0m',