luatz-scm-0.rockspec: license is not MIT/X11 variant

[etc/awesome.git] / luatz / tzcache.lua

diff --git a/luatz/tzcache.lua b/luatz/tzcache.lua
index 25a664dffd12e19605787959f896eae604e7d59f..ae32dceddd08abf8eb65ac52b8eaaddea1260f6c 100644 (file)
--- a/luatz/tzcache.lua
+++ b/luatz/tzcache.lua
@@ -2,32 +2,34 @@ local read_tzfile = require "luatz.tzfile".read_tzfile
 
 local base_zoneinfo_path = "/usr/share/zoneinfo/"
 local local_zoneinfo_path = "/etc/localtime"
 
 local base_zoneinfo_path = "/usr/share/zoneinfo/"
 local local_zoneinfo_path = "/etc/localtime"

-local tz_cache = { }
+local tz_cache = {}

 
 

-local function name_to_zoneinfo_path ( name )
-       if name then
-               return base_zoneinfo_path .. name
-       else
+local function name_to_zoneinfo_path(name)
+       if name == nil then

                return local_zoneinfo_path
                return local_zoneinfo_path

+       elseif name:sub(1, 1) == "/" then
+               return name
+       else
+               return base_zoneinfo_path .. name

        end
 end
 
        end
 end
 

-local function clear_tz_cache ( name )
-       tz_cache [ name_to_zoneinfo_path ( name ) ] = nil
+local function clear_tz_cache(name)
+       tz_cache[name_to_zoneinfo_path(name)] = nil

 end
 
 end
 

-local function get_tz ( name )
-       local path = name_to_zoneinfo_path ( name )
+local function get_tz(name)
+       local path = name_to_zoneinfo_path(name)

        -- TODO: stat path
        -- TODO: stat path

-       local tzinfo = tz_cache [ path ]
+       local tzinfo = tz_cache[path]

        if tzinfo == nil then
        if tzinfo == nil then

-               tzinfo = read_tzfile ( path )
-               tz_cache [ path ] = tzinfo
+               tzinfo = read_tzfile(path)
+               tz_cache[path] = tzinfo

        end
        return tzinfo
 end
 
 return {
        end
        return tzinfo
 end
 
 return {

-       get_tz = get_tz ;
-       clear_tz_cache = clear_tz_cache ;
+       get_tz = get_tz;
+       clear_tz_cache = clear_tz_cache;

 }
 }