qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 03:04:41 -07:00
Code Releases Activity

time: Support Solaris zoneinfo directory.

Browse Source 
R=rsc
CC=golang-dev
https://golang.org/cl/4079047
This commit is contained in:
Ian Lance Taylor 2011-01-28 15:56:14 -08:00
parent 504da53c85
commit 64c7f70c66
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pkg/time/zoneinfo_unix.go
View File

@ -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() {
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
} }