]> git.madduck.net Git - etc/awesome.git/blobdiff - luatz/tzfile.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

luatz/strftime: Fix asctime (forgot to call string.format)
[etc/awesome.git] / luatz / tzfile.lua
index eed426e75efc475af1d43ff3e2c81adf80f1ea57..a3fa7941171e5c5d188481a7aa6b7dd9fe7e9e72 100644 (file)
@@ -1,4 +1,6 @@
 local tz_info_mt = require "luatz.tzinfo".tz_info_mt
+local tt_info_mt = require "luatz.tzinfo".tt_info_mt
+
 
 local function read_int32be ( fd )
        local data , err = fd:read ( 4 )
@@ -39,7 +41,7 @@ end
 
 local fifteen_nulls = ("\0"):rep(15)
 local function read_tz ( fd )
-       assert ( fd:read(4) == "TZif" )
+       assert ( fd:read(4) == "TZif" , "Invalid TZ file" )
        local version = assert ( fd:read(1) )
        if version == "\0" or version == "2" then
                local MIN_TIME = -2^32+1
@@ -93,7 +95,9 @@ local function read_tz ( fd )
 
                local isgmt = assert ( read_flags ( fd , tzh_ttisgmtcnt ) )
 
-               if version == "2" then
+               local TZ
+
+               if version == "2" or version == "3" then
                        --[[
                        For version-2-format timezone files, the above header and data is followed by a second header and data,
                        identical in format except that eight bytes are used for each transition time or leap-second time.
@@ -155,6 +159,23 @@ local function read_tz ( fd )
                        for use in handling instants after the last transition time stored in the file
                        (with nothing between the newlines if there is no POSIX representation for such instants).
                        ]]
+
+                       --[[
+                       For version-3-format time zone files, the POSIX-TZ-style string may
+                       use two minor extensions to the POSIX TZ format, as described in newtzset (3).
+                       First, the hours part of its transition times may be signed and range from
+                       -167 through 167 instead of the POSIX-required unsigned values
+                       from 0 through 24.  Second, DST is in effect all year if it starts
+                       January 1 at 00:00 and ends December 31 at 24:00 plus the difference
+                       between daylight saving and standard time.
+                       ]]
+
+                       assert ( assert ( fd:read ( 1 ) ) == "\n" , "Expected newline at end of version 2 header" )
+
+                       TZ = assert ( fd:read ( "*l" ) )
+                       if #TZ == 0 then
+                               TZ = nil
+                       end
                end
 
                for i=1, tzh_typecnt do
@@ -162,6 +183,7 @@ local function read_tz ( fd )
                        v.abbr = abbreviations:sub ( v.abbrind+1 , v.abbrind+3 )
                        v.isstd = isstd [ i ] or false
                        v.isgmt = isgmt [ i ] or false
+                       setmetatable ( v , tt_info_mt )
                end
 
                --[[
@@ -198,7 +220,7 @@ local function read_tz ( fd )
 end
 
 local function read_tzfile ( path )
-       local fd = assert ( io.open ( path ) )
+       local fd = assert ( io.open ( path , "rb" ) )
        local tzinfo = read_tz ( fd )
        fd:close ( )
        return tzinfo