qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 06:07:58 -07:00
Code Releases Activity

Make exp/draw/x11 respect $XAUTHORITY.

Browse Source 
R=rsc, cw, nigeltao_golang
CC=golang-dev
https://golang.org/cl/1134041
This commit is contained in:
Nigel Tao 2010-05-06 18:41:42 +10:00
parent 7861da737e
commit 20ba090978
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/pkg/exp/draw/x11/auth.go
View File

@ -10,7 +10,7 @@ import (
"os" "os"
) )
// Reads the DISPLAY environment variable, and returns the "12" in ":12.0". // getDisplay reads the DISPLAY environment variable, and returns the "12" in ":12.0".
func getDisplay() string { func getDisplay() string {
d := os.Getenv("DISPLAY") d := os.Getenv("DISPLAY")
if len(d) < 1 || d[0] != ':' { if len(d) < 1 || d[0] != ':' {
@ -25,7 +25,7 @@ func getDisplay() string {
return d[1:i] return d[1:i]
} }
// Reads a big-endian uint16 from r, using b as a scratch buffer. // readU16BE reads a big-endian uint16 from r, using b as a scratch buffer.
func readU16BE(r io.Reader, b []byte) (uint16, os.Error) { func readU16BE(r io.Reader, b []byte) (uint16, os.Error) {
_, err := io.ReadFull(r, b[0:2]) _, err := io.ReadFull(r, b[0:2])
if err != nil { if err != nil {
@ -34,34 +34,38 @@ func readU16BE(r io.Reader, b []byte) (uint16, os.Error) {
return uint16(b[0])<<8 + uint16(b[1]), nil return uint16(b[0])<<8 + uint16(b[1]), nil
} }
// Reads a length-prefixed string from r, using b as a scratch buffer. // readStr reads a length-prefixed string from r, using b as a scratch buffer.
func readStr(r io.Reader, b []byte) (s string, err os.Error) { func readStr(r io.Reader, b []byte) (string, os.Error) {
n, err := readU16BE(r, b) n, err := readU16BE(r, b)
if err != nil { if err != nil {
return return "", err
} }
if int(n) > len(b) { if int(n) > len(b) {
return s, os.NewError("Xauthority entry too long for buffer") return "", os.NewError("Xauthority entry too long for buffer")
} }
_, err = io.ReadFull(r, b[0:n]) _, err = io.ReadFull(r, b[0:n])
if err != nil { if err != nil {
return return "", err
} }
return string(b[0:n]), nil return string(b[0:n]), nil
} }
// Reads the ~/.Xauthority file and returns the name/data pair for the DISPLAY. // readAuth reads the X authority file and returns the name/data pair for the DISPLAY.
// b is a scratch buffer to use, and should be at least 256 bytes long (i.e. it should be able to hold a hostname). // b is a scratch buffer to use, and should be at least 256 bytes long (i.e. it should be able to hold a hostname).
func readAuth(b []byte) (name, data string, err os.Error) { func readAuth(b []byte) (name, data string, err os.Error) {
// As per /usr/include/X11/Xauth.h. // As per /usr/include/X11/Xauth.h.
const familyLocal = 256 const familyLocal = 256
home := os.Getenv("HOME") fn := os.Getenv("XAUTHORITY")
if len(home) == 0 { if fn == "" {
err = os.NewError("unknown HOME") home := os.Getenv("HOME")
return if home == "" {
err = os.NewError("Xauthority not found: $XAUTHORITY, $HOME not set")
return
}
fn = home + "/.Xauthority"
} }
r, err := os.Open(home+"/.Xauthority", os.O_RDONLY, 0444) r, err := os.Open(fn, os.O_RDONLY, 0444)
if err != nil { if err != nil {
return return
} }