From: Giles Lean <giles.lean@pobox.com>
Date: Tue, 16 Feb 2010 19:43:25 +0000 (-0800)
Subject: syscall: make signature of Umask on OS X, FreeBSD match Linux.
X-Git-Tag: weekly.2010-02-17~19
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5aa3a8de6d16404e26438fec7a386a93bedd0297;p=gostls13.git

syscall: make signature of Umask on OS X, FreeBSD match Linux.

R=rsc
CC=golang-dev
https://golang.org/cl/207071
---

diff --git a/src/pkg/syscall/syscall_darwin.go b/src/pkg/syscall/syscall_darwin.go
index 1946ecd78c..291ea557b0 100644
--- a/src/pkg/syscall/syscall_darwin.go
+++ b/src/pkg/syscall/syscall_darwin.go
@@ -552,7 +552,7 @@ func Kill(pid int, signum int) (errno int) { return kill(pid, signum, 1) }
 //sys	Symlink(path string, link string) (errno int)
 //sys	Sync() (errno int)
 //sys	Truncate(path string, length int64) (errno int)
-//sys	Umask(newmask int) (errno int)
+//sys	Umask(newmask int) (oldmask int)
 //sys	Undelete(path string) (errno int)
 //sys	Unlink(path string) (errno int)
 //sys	Unmount(path string, flags int) (errno int)
diff --git a/src/pkg/syscall/syscall_freebsd.go b/src/pkg/syscall/syscall_freebsd.go
index 906955e979..f5bb454124 100644
--- a/src/pkg/syscall/syscall_freebsd.go
+++ b/src/pkg/syscall/syscall_freebsd.go
@@ -549,7 +549,7 @@ func SysctlUint32(name string) (value uint32, errno int) {
 //sys	Symlink(path string, link string) (errno int)
 //sys	Sync() (errno int)
 //sys	Truncate(path string, length int64) (errno int)
-//sys	Umask(newmask int) (errno int)
+//sys	Umask(newmask int) (oldmask int)
 //sys	Undelete(path string) (errno int)
 //sys	Unlink(path string) (errno int)
 //sys	Unmount(path string, flags int) (errno int)
diff --git a/src/pkg/syscall/zsyscall_darwin_386.go b/src/pkg/syscall/zsyscall_darwin_386.go
index 6442f078b3..92525e3a80 100644
--- a/src/pkg/syscall/zsyscall_darwin_386.go
+++ b/src/pkg/syscall/zsyscall_darwin_386.go
@@ -623,9 +623,9 @@ func Truncate(path string, length int64) (errno int) {
 	return
 }
 
-func Umask(newmask int) (errno int) {
-	_, _, e1 := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	errno = int(e1)
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
 	return
 }
 
diff --git a/src/pkg/syscall/zsyscall_darwin_amd64.go b/src/pkg/syscall/zsyscall_darwin_amd64.go
index 5f4f9ee1d2..a0fc52c85e 100644
--- a/src/pkg/syscall/zsyscall_darwin_amd64.go
+++ b/src/pkg/syscall/zsyscall_darwin_amd64.go
@@ -623,9 +623,9 @@ func Truncate(path string, length int64) (errno int) {
 	return
 }
 
-func Umask(newmask int) (errno int) {
-	_, _, e1 := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	errno = int(e1)
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
 	return
 }
 
diff --git a/src/pkg/syscall/zsyscall_freebsd_386.go b/src/pkg/syscall/zsyscall_freebsd_386.go
index 9e165086a4..9e22134180 100644
--- a/src/pkg/syscall/zsyscall_freebsd_386.go
+++ b/src/pkg/syscall/zsyscall_freebsd_386.go
@@ -623,9 +623,9 @@ func Truncate(path string, length int64) (errno int) {
 	return
 }
 
-func Umask(newmask int) (errno int) {
-	_, _, e1 := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	errno = int(e1)
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
 	return
 }
 
diff --git a/src/pkg/syscall/zsyscall_freebsd_amd64.go b/src/pkg/syscall/zsyscall_freebsd_amd64.go
index f6d42bcd34..da67cdb829 100644
--- a/src/pkg/syscall/zsyscall_freebsd_amd64.go
+++ b/src/pkg/syscall/zsyscall_freebsd_amd64.go
@@ -623,9 +623,9 @@ func Truncate(path string, length int64) (errno int) {
 	return
 }
 
-func Umask(newmask int) (errno int) {
-	_, _, e1 := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
-	errno = int(e1)
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
 	return
 }