From: Ian Lance Taylor <iant@golang.org>
Date: Fri, 28 Jan 2011 23:56:14 +0000 (-0800)
Subject: time: Support Solaris zoneinfo directory.
X-Git-Tag: weekly.2011-02-01~48
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=64c7f70c66080aca3fc0b5550608e052eb28ca5d;p=gostls13.git

time: Support Solaris zoneinfo directory.

R=rsc
CC=golang-dev
https://golang.org/cl/4079047
---

diff --git a/src/pkg/time/zoneinfo_unix.go b/src/pkg/time/zoneinfo_unix.go
index 26c86ab038..6685da7477 100644
--- a/src/pkg/time/zoneinfo_unix.go
+++ b/src/pkg/time/zoneinfo_unix.go
@@ -18,6 +18,7 @@ import (
 const (
 	headerSize = 4 + 16 + 4*7
 	zoneDir    = "/usr/share/zoneinfo/"
+	zoneDir2   = "/usr/share/lib/zoneinfo/"
 )
 
 // Simple I/O interface to binary blob of data.
@@ -216,7 +217,11 @@ func setupZone() {
 	case err == os.ENOENV:
 		zones, _ = readinfofile("/etc/localtime")
 	case len(tz) > 0:
-		zones, _ = readinfofile(zoneDir + tz)
+		var ok bool
+		zones, ok = readinfofile(zoneDir + tz)
+		if !ok {
+			zones, _ = readinfofile(zoneDir2 + tz)
+		}
 	case len(tz) == 0:
 		// do nothing: use UTC
 	}