diff options
| author | Ian Lance Taylor <iant@golang.org> | 2011-04-25 12:37:00 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2011-04-25 12:37:00 -0700 |
| commit | 41e5de21847f34684966615899ce42dfd76be16f (patch) | |
| tree | d8689f7aef64a8ff154a5c92fdd15a53f442f695 | |
| parent | c2c7ee2736b5032a5e35577b3da54030ed8d3f63 (diff) | |
| download | go-41e5de21847f34684966615899ce42dfd76be16f.tar.gz go-41e5de21847f34684966615899ce42dfd76be16f.zip | |
time: Support Irix 6 location for zoneinfo files.
R=rsc
CC=golang-dev
https://golang.org/cl/4440066
| -rw-r--r-- | src/pkg/time/zoneinfo_unix.go | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/pkg/time/zoneinfo_unix.go b/src/pkg/time/zoneinfo_unix.go index 6685da7477..42659ed606 100644 --- a/src/pkg/time/zoneinfo_unix.go +++ b/src/pkg/time/zoneinfo_unix.go @@ -17,8 +17,6 @@ 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. @@ -211,16 +209,22 @@ func setupZone() { // no $TZ means use the system default /etc/localtime. // $TZ="" means use UTC. // $TZ="foo" means use /usr/share/zoneinfo/foo. + // Many systems use /usr/share/zoneinfo, Solaris 2 has + // /usr/share/lib/zoneinfo, IRIX 6 has /usr/lib/locale/TZ. + zoneDirs := []string{"/usr/share/zoneinfo/", + "/usr/share/lib/zoneinfo/", + "/usr/lib/locale/TZ/"} tz, err := os.Getenverror("TZ") switch { case err == os.ENOENV: zones, _ = readinfofile("/etc/localtime") case len(tz) > 0: - var ok bool - zones, ok = readinfofile(zoneDir + tz) - if !ok { - zones, _ = readinfofile(zoneDir2 + tz) + for _, zoneDir := range zoneDirs { + var ok bool + if zones, ok = readinfofile(zoneDir + tz); ok { + break + } } case len(tz) == 0: // do nothing: use UTC |