Commit 64c7f70c authored by Ian Lance Taylor's avatar Ian Lance Taylor

time: Support Solaris zoneinfo directory.

R=rsc
CC=golang-dev
https://golang.org/cl/4079047
parent 504da53c
...@@ -18,6 +18,7 @@ import ( ...@@ -18,6 +18,7 @@ import (
const ( const (
headerSize = 4 + 16 + 4*7 headerSize = 4 + 16 + 4*7
zoneDir = "/usr/share/zoneinfo/" 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.
...@@ -216,7 +217,11 @@ func setupZone() { ...@@ -216,7 +217,11 @@ func setupZone() {
case err == os.ENOENV: case err == os.ENOENV:
zones, _ = readinfofile("/etc/localtime") zones, _ = readinfofile("/etc/localtime")
case len(tz) > 0: 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: 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