]> git.madduck.net Git - etc/awesome.git/commitdiff

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/tzfile: Read in (but don't yet use) TZ string
authordaurnimator <quae@daurnimator.com>
Mon, 18 Aug 2014 19:06:06 +0000 (15:06 -0400)
committerdaurnimator <quae@daurnimator.com>
Mon, 18 Aug 2014 19:06:06 +0000 (15:06 -0400)
luatz/tzfile.lua

index a0f8da5fb62e969bd62bf7b4f13d1afb74d9d407..36fd8a765a775e12a67715ec63cc8f6215a3fc41 100644 (file)
@@ -95,6 +95,8 @@ local function read_tz ( fd )
 
                local isgmt = assert ( read_flags ( fd , tzh_ttisgmtcnt ) )
 
 
                local isgmt = assert ( read_flags ( fd , tzh_ttisgmtcnt ) )
 
+               local TZ
+
                if version == "2" then
                        --[[
                        For version-2-format timezone files, the above header and data is followed by a second header and data,
                if version == "2" then
                        --[[
                        For version-2-format timezone files, the above header and data is followed by a second header and data,
@@ -157,6 +159,12 @@ 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 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).
                        ]]
+                       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
                end
 
                for i=1, tzh_typecnt do