From eee3680bb4dbb5f135cc6285bb83833b4e237fec Mon Sep 17 00:00:00 2001
From: Philipp Gesang <philipp.gesang@alumni.uni-heidelberg.de>
Date: Fri, 19 Oct 2012 20:23:49 +0200
Subject: update l-file l-table; add yet uncommitted changes

---
 lualibs-os.lua | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 73 insertions(+), 2 deletions(-)

(limited to 'lualibs-os.lua')

diff --git a/lualibs-os.lua b/lualibs-os.lua
index 95d007d..799f449 100644
--- a/lualibs-os.lua
+++ b/lualibs-os.lua
@@ -115,8 +115,8 @@ if not os.__getenv__ then
     end
 
 end
-local find, format, gsub = string.find, string.format, string.gsub
-local random, ceil = math.random, math.ceil
+
+-- end of environment hack
 
 local execute, spawn, exec, iopopen, ioflush = os.execute, os.spawn or os.execute, os.exec or os.execute, io.popen, io.flush
 
@@ -381,3 +381,74 @@ function os.timezone(delta)
         return 1
     end
 end
+
+local timeformat = format("%%s%s",os.timezone(true))
+local dateformat = "!%Y-%m-%d %H:%M:%S"
+
+function os.fulltime(t,default)
+    t = tonumber(t) or 0
+    if t > 0 then
+        -- valid time
+    elseif default then
+        return default
+    else
+        t = nil
+    end
+    return format(timeformat,date(dateformat,t))
+end
+
+local dateformat = "%Y-%m-%d %H:%M:%S"
+
+function os.localtime(t,default)
+    t = tonumber(t) or 0
+    if t > 0 then
+        -- valid time
+    elseif default then
+        return default
+    else
+        t = nil
+    end
+    return date(dateformat,t)
+end
+
+function os.converttime(t,default)
+    local t = tonumber(t)
+    if t and t > 0 then
+        return date(dateformat,t)
+    else
+        return default or "-"
+    end
+end
+
+local memory = { }
+
+local function which(filename)
+    local fullname = memory[filename]
+    if fullname == nil then
+        local suffix = file.suffix(filename)
+        local suffixes = suffix == "" and os.binsuffixes or { suffix }
+        for directory in gmatch(os.getenv("PATH"),"[^" .. io.pathseparator .."]+") do
+            local df = file.join(directory,filename)
+            for i=1,#suffixes do
+                local dfs = file.addsuffix(df,suffixes[i])
+                if io.exists(dfs) then
+                    fullname = dfs
+                    break
+                end
+            end
+        end
+        if not fullname then
+            fullname = false
+        end
+        memory[filename] = fullname
+    end
+    return fullname
+end
+
+os.which = which
+os.where = which
+
+-- print(os.which("inkscape.exe"))
+-- print(os.which("inkscape"))
+-- print(os.which("gs.exe"))
+-- print(os.which("ps2pdf"))
-- 
cgit v1.2.3