git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgo/time: Support Irix 6 location of zoneinfo files. 

From-SVN: r172936
This commit is contained in:
Ian Lance Taylor 2011-04-25 19:42:33 +00:00
parent 9f3b1e6c60
commit eb864be48f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libgo/go/time/zoneinfo_unix.go
View File

@ -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() {
// 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:
var ok bool for _, zoneDir := range zoneDirs {
zones, ok = readinfofile(zoneDir + tz) var ok bool
if !ok { if zones, ok = readinfofile(zoneDir + tz); ok {
zones, _ = readinfofile(zoneDir2 + tz) break
}
} }
case len(tz) == 0: case len(tz) == 0:
// do nothing: use UTC // do nothing: use UTC