Skip to content

G
golang
Commit 41e5de21 authored by Ian Lance Taylor's avatar Ian Lance Taylor
Browse files
Options

time: Support Irix 6 location for zoneinfo files. 

R=rsc
CC=golang-dev
https://golang.org/cl/4440066
parent c2c7ee27
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
src/pkg/time/zoneinfo_unix.go
View file @ 41e5de21
...@@ -17,8 +17,6 @@ import ( ...@@ -17,8 +17,6 @@ import (
const ( const (
headerSize = 4 + 16 + 4*7 headerSize = 4 + 16 + 4*7
zoneDir = "/usr/share/zoneinfo/"
zoneDir2 = "/usr/share/lib/zoneinfo/"
) )
// Simple I/O interface to binary blob of data. // Simple I/O interface to binary blob of data.
...@@ -211,16 +209,22 @@ func setupZone() { ...@@ -211,16 +209,22 @@ func setupZone() {
// no $TZ means use the system default /etc/localtime. // no $TZ means use the system default /etc/localtime.
// $TZ="" means use UTC. // $TZ="" means use UTC.
// $TZ="foo" means use /usr/share/zoneinfo/foo. // $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") tz, err := os.Getenverror("TZ")
switch { switch {
case err == os.ENOENV: case err == os.ENOENV:
zones, _ = readinfofile("/etc/localtime") zones, _ = readinfofile("/etc/localtime")
case len(tz) > 0: case len(tz) > 0:
for _, zoneDir := range zoneDirs {
var ok bool var ok bool
zones, ok = readinfofile(zoneDir + tz) if zones, ok = readinfofile(zoneDir + tz); ok {
if !ok { break
zones, _ = readinfofile(zoneDir2 + tz) }
} }
case len(tz) == 0: case len(tz) == 0:
// do nothing: use UTC // do nothing: use UTC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment