X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/e5c87b4489b0881b7b9903733478f0d11ac96ab7..bbc7e867d92c185d6316bdd222202f357f8253a3:/luatz/tzfile.lua

diff --git a/luatz/tzfile.lua b/luatz/tzfile.lua
index eed426e..a0f8da5 100644
--- a/luatz/tzfile.lua
+++ b/luatz/tzfile.lua
@@ -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
@@ -162,6 +164,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 +201,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