aboutsummaryrefslogtreecommitdiff
path: root/nexgb
diff options
context:
space:
mode:
authorAndrew Gallant (Ocelot) <Andrew.Gallant@tufts.edu>2012-05-07 04:17:11 -0400
committerAndrew Gallant (Ocelot) <Andrew.Gallant@tufts.edu>2012-05-07 04:17:11 -0400
commitdaad54a5e114dcff9ef62abbbd18ea52929d01e5 (patch)
treea9ef8a78d77f4e37a2bfa3b82db1063e4efd6e13 /nexgb
parenteed777ebfd37ceff35077c7a00555876e02b4b87 (diff)
downloadhaven-daad54a5e114dcff9ef62abbbd18ea52929d01e5.tar.gz
haven-daad54a5e114dcff9ef62abbbd18ea52929d01e5.tar.xz
haven-daad54a5e114dcff9ef62abbbd18ea52929d01e5.zip
important stuff first please
Diffstat (limited to 'nexgb')
-rw-r--r--nexgb/auth.go62
1 files changed, 31 insertions, 31 deletions
diff --git a/nexgb/auth.go b/nexgb/auth.go
index ac43e07..85e2d56 100644
--- a/nexgb/auth.go
+++ b/nexgb/auth.go
@@ -11,37 +11,6 @@ import (
"os"
)
-func getU16BE(r io.Reader, b []byte) (uint16, error) {
- _, err := io.ReadFull(r, b[0:2])
- if err != nil {
- return 0, err
- }
- return uint16(b[0])<<8 + uint16(b[1]), nil
-}
-
-func getBytes(r io.Reader, b []byte) ([]byte, error) {
- n, err := getU16BE(r, b)
- if err != nil {
- return nil, err
- }
- if int(n) > len(b) {
- return nil, errors.New("bytes too long for buffer")
- }
- _, err = io.ReadFull(r, b[0:n])
- if err != nil {
- return nil, err
- }
- return b[0:n], nil
-}
-
-func getString(r io.Reader, b []byte) (string, error) {
- b, err := getBytes(r, b)
- if err != nil {
- return "", err
- }
- return string(b), nil
-}
-
// readAuthority reads the X authority file for the DISPLAY.
// If hostname == "" or hostname == "localhost",
// then use the system's hostname (as returned by os.Hostname) instead.
@@ -111,3 +80,34 @@ func readAuthority(hostname, display string) (
}
panic("unreachable")
}
+
+func getU16BE(r io.Reader, b []byte) (uint16, error) {
+ _, err := io.ReadFull(r, b[0:2])
+ if err != nil {
+ return 0, err
+ }
+ return uint16(b[0])<<8 + uint16(b[1]), nil
+}
+
+func getBytes(r io.Reader, b []byte) ([]byte, error) {
+ n, err := getU16BE(r, b)
+ if err != nil {
+ return nil, err
+ }
+ if int(n) > len(b) {
+ return nil, errors.New("bytes too long for buffer")
+ }
+ _, err = io.ReadFull(r, b[0:n])
+ if err != nil {
+ return nil, err
+ }
+ return b[0:n], nil
+}
+
+func getString(r io.Reader, b []byte) (string, error) {
+ b, err := getBytes(r, b)
+ if err != nil {
+ return "", err
+ }
+ return string(b), nil
+}