Commit bcf48076 authored by Rob Pike's avatar Rob Pike

fix up syscall for darwin after StringToBytes change

R=rsc
DELTA=30  (0 added, 18 deleted, 12 changed)
OCL=24628
CL=24628
parent 704bc9d5
...@@ -14,20 +14,14 @@ import ( ...@@ -14,20 +14,14 @@ import (
const nameBufsize = 512 const nameBufsize = 512
func Open(name string, mode int64, perm int64) (ret int64, errno int64) { func Open(name string, mode int64, perm int64) (ret int64, errno int64) {
var namebuf [nameBufsize]byte; namebuf := StringBytePtr(name);
if !StringToBytes(namebuf, name) { r1, r2, err := Syscall(SYS_OPEN, int64(uintptr(unsafe.Pointer(namebuf))), mode, perm);
return -1, ENAMETOOLONG
}
r1, r2, err := Syscall(SYS_OPEN, int64(uintptr(unsafe.Pointer(&namebuf[0]))), mode, perm);
return r1, err; return r1, err;
} }
func Creat(name string, perm int64) (ret int64, errno int64) { func Creat(name string, perm int64) (ret int64, errno int64) {
var namebuf [nameBufsize]byte; namebuf := StringBytePtr(name);
if !StringToBytes(namebuf, name) { r1, r2, err := Syscall(SYS_OPEN, int64(uintptr(unsafe.Pointer(namebuf))), O_CREAT|O_WRONLY|O_TRUNC, perm);
return -1, ENAMETOOLONG
}
r1, r2, err := Syscall(SYS_OPEN, int64(uintptr(unsafe.Pointer(&namebuf[0]))), O_CREAT|O_WRONLY|O_TRUNC, perm);
return r1, err; return r1, err;
} }
...@@ -57,20 +51,14 @@ func Pipe(fds *[2]int64) (ret int64, errno int64) { ...@@ -57,20 +51,14 @@ func Pipe(fds *[2]int64) (ret int64, errno int64) {
} }
func Stat(name string, buf *Stat_t) (ret int64, errno int64) { func Stat(name string, buf *Stat_t) (ret int64, errno int64) {
var namebuf [nameBufsize]byte; namebuf := StringBytePtr(name);
if !StringToBytes(namebuf, name) { r1, r2, err := Syscall(SYS_STAT64, int64(uintptr(unsafe.Pointer(namebuf))), int64(uintptr(unsafe.Pointer(buf))), 0);
return -1, ENAMETOOLONG
}
r1, r2, err := Syscall(SYS_STAT64, int64(uintptr(unsafe.Pointer(&namebuf[0]))), int64(uintptr(unsafe.Pointer(buf))), 0);
return r1, err; return r1, err;
} }
func Lstat(name string, buf *Stat_t) (ret int64, errno int64) { func Lstat(name string, buf *Stat_t) (ret int64, errno int64) {
var namebuf [nameBufsize]byte; namebuf := StringBytePtr(name);
if !StringToBytes(namebuf, name) { r1, r2, err := Syscall(SYS_LSTAT64, int64(uintptr(unsafe.Pointer(namebuf))), int64(uintptr(unsafe.Pointer(buf))), 0);
return -1, ENAMETOOLONG
}
r1, r2, err := Syscall(SYS_LSTAT64, int64(uintptr(unsafe.Pointer(&namebuf[0]))), int64(uintptr(unsafe.Pointer(buf))), 0);
return r1, err; return r1, err;
} }
...@@ -80,11 +68,8 @@ func Fstat(fd int64, buf *Stat_t) (ret int64, errno int64) { ...@@ -80,11 +68,8 @@ func Fstat(fd int64, buf *Stat_t) (ret int64, errno int64) {
} }
func Unlink(name string) (ret int64, errno int64) { func Unlink(name string) (ret int64, errno int64) {
var namebuf [nameBufsize]byte; namebuf := StringBytePtr(name);
if !StringToBytes(namebuf, name) { r1, r2, err := Syscall(SYS_UNLINK, int64(uintptr(unsafe.Pointer(namebuf))), 0, 0);
return -1, ENAMETOOLONG
}
r1, r2, err := Syscall(SYS_UNLINK, int64(uintptr(unsafe.Pointer(&namebuf[0]))), 0, 0);
return r1, err; return r1, err;
} }
...@@ -94,11 +79,8 @@ func Fcntl(fd, cmd, arg int64) (ret int64, errno int64) { ...@@ -94,11 +79,8 @@ func Fcntl(fd, cmd, arg int64) (ret int64, errno int64) {
} }
func Mkdir(name string, perm int64) (ret int64, errno int64) { func Mkdir(name string, perm int64) (ret int64, errno int64) {
var namebuf [nameBufsize]byte; namebuf := StringBytePtr(name);
if !StringToBytes(namebuf, name) { r1, r2, err := Syscall(SYS_MKDIR, int64(uintptr(unsafe.Pointer(namebuf))), perm, 0);
return -1, ENAMETOOLONG
}
r1, r2, err := Syscall(SYS_MKDIR, int64(uintptr(unsafe.Pointer(&namebuf[0]))), perm, 0);
return r1, err; return r1, err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment