syscall: use 64-bit file size for truncation on Linux

Truncate and Ftruncate for 32-bit Linux should use 64-bit
offset system calls.

R=rsc
CC=golang-dev, royger
https://golang.org/cl/2943041

diff --git a/src/pkg/syscall/syscall_linux.go b/src/pkg/syscall/syscall_linux.go
index 9b4e2db07145ed9d05588c3752290096612e38a4..d34956c31da326c683614a55dc890a84a7831a85 100644 (file)
--- a/src/pkg/syscall/syscall_linux.go
+++ b/src/pkg/syscall/syscall_linux.go
@@ -623,7 +623,6 @@ func PtraceDetach(pid int) (errno int) { return ptrace(PTRACE_DETACH, pid, 0, 0)
 //sys  fcntl(fd int, cmd int, arg int) (val int, errno int)
 //sys  Fdatasync(fd int) (errno int)
 //sys  Fsync(fd int) (errno int)
-//sys  Ftruncate(fd int, length int64) (errno int)
 //sys  Getdents(fd int, buf []byte) (n int, errno int) = SYS_GETDENTS64
 //sys  Getpgid(pid int) (pgid int, errno int)
 //sys  Getpgrp() (pid int)
@@ -665,7 +664,6 @@ func PtraceDetach(pid int) (errno int) { return ptrace(PTRACE_DETACH, pid, 0, 0)
 //sys  Tee(rfd int, wfd int, len int, flags int) (n int64, errno int)
 //sys  Tgkill(tgid int, tid int, sig int) (errno int)
 //sys  Times(tms *Tms) (ticks uintptr, errno int)
-//sys  Truncate(path string, length int64) (errno int)
 //sys  Umask(mask int) (oldmask int)
 //sys  Uname(buf *Utsname) (errno int)
 //sys  Unlink(path string) (errno int)

diff --git a/src/pkg/syscall/syscall_linux_386.go b/src/pkg/syscall/syscall_linux_386.go
index 30eb11e2602c2b850d721f0b86494dd51062d5fc..88b3034346834c1cf5c69ac53cd147142234ee65 100644 (file)
--- a/src/pkg/syscall/syscall_linux_386.go
+++ b/src/pkg/syscall/syscall_linux_386.go
@@ -30,6 +30,7 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
 //sys  Chown(path string, uid int, gid int) (errno int) = SYS_CHOWN32
 //sys  Fchown(fd int, uid int, gid int) (errno int) = SYS_FCHOWN32
 //sys  Fstat(fd int, stat *Stat_t) (errno int) = SYS_FSTAT64
+//sys  Ftruncate(fd int, length int64) (errno int) = SYS_FTRUNCATE64
 //sys  Getegid() (egid int) = SYS_GETEGID32
 //sys  Geteuid() (euid int) = SYS_GETEUID32
 //sys  Getgid() (gid int) = SYS_GETGID32
@@ -49,6 +50,7 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
 //sys  Setreuid(ruid int, euid int) (errno int) = SYS_SETREUID32
 //sys  Stat(path string, stat *Stat_t) (errno int) = SYS_STAT64
 //sys  SyncFileRange(fd int, off int64, n int64, flags int) (errno int)
+//sys  Truncate(path string, length int64) (errno int) = SYS_TRUNCATE64
 //sys  getgroups(n int, list *_Gid_t) (nn int, errno int) = SYS_GETGROUPS32
 //sys  setgroups(n int, list *_Gid_t) (errno int) = SYS_SETGROUPS32
 //sys  Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, errno int) = SYS__NEWSELECT

diff --git a/src/pkg/syscall/syscall_linux_amd64.go b/src/pkg/syscall/syscall_linux_amd64.go
index d19b95d72a9fced516d893bb0a560d952a851746..fda8260689fe901b08bc3538276e9d71a84b6a9b 100644 (file)
--- a/src/pkg/syscall/syscall_linux_amd64.go
+++ b/src/pkg/syscall/syscall_linux_amd64.go
@@ -8,6 +8,7 @@ package syscall
 //sys  Fchown(fd int, uid int, gid int) (errno int)
 //sys  Fstat(fd int, stat *Stat_t) (errno int)
 //sys  Fstatfs(fd int, buf *Statfs_t) (errno int)
+//sys  Ftruncate(fd int, length int64) (errno int)
 //sys  Getegid() (egid int)
 //sys  Geteuid() (euid int)
 //sys  Getgid() (gid int)
@@ -32,6 +33,7 @@ package syscall
 //sys  Stat(path string, stat *Stat_t) (errno int)
 //sys  Statfs(path string, buf *Statfs_t) (errno int)
 //sys  SyncFileRange(fd int, off int64, n int64, flags int) (errno int)
+//sys  Truncate(path string, length int64) (errno int)
 //sys  accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, errno int)
 //sys  bind(s int, addr uintptr, addrlen _Socklen) (errno int)
 //sys  connect(s int, addr uintptr, addrlen _Socklen) (errno int)

diff --git a/src/pkg/syscall/syscall_linux_arm.go b/src/pkg/syscall/syscall_linux_arm.go
index 8fcfeecf3e5b47f8c035042e3d276af4cb8f8a85..bc6592f156c3f28d84b656a79ee73e1488fb2543 100644 (file)
--- a/src/pkg/syscall/syscall_linux_arm.go
+++ b/src/pkg/syscall/syscall_linux_arm.go
@@ -69,6 +69,7 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, errno int)
 //sys  Fchown(fd int, uid int, gid int) (errno int)
 //sys  Fstat(fd int, stat *Stat_t) (errno int) = SYS_FSTAT64
 //sys  Fstatfs(fd int, buf *Statfs_t) (errno int) = SYS_FSTATFS64
+//sys  Ftruncate(fd int, length int64) (errno int) = SYS_FTRUNCATE64
 //sys  Getegid() (egid int)
 //sys  Geteuid() (euid int)
 //sys  Getgid() (gid int)
@@ -87,6 +88,7 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, errno int)
 //sys  Shutdown(fd int, how int) (errno int)
 //sys  Stat(path string, stat *Stat_t) (errno int) = SYS_STAT64
 //sys  Statfs(path string, buf *Statfs_t) (errno int) = SYS_STATFS64
+//sys  Truncate(path string, length int64) (errno int) = SYS_TRUNCATE64
 
 // Vsyscalls on amd64.
 //sys  Gettimeofday(tv *Timeval) (errno int)

diff --git a/src/pkg/syscall/zsyscall_linux_386.go b/src/pkg/syscall/zsyscall_linux_386.go
index 968dcb8a907dc0db697d4073250b674fab4bd577..1d0c1c1c01cdfa79b428ac7c2d7bd2be52bf54eb 100644 (file)
--- a/src/pkg/syscall/zsyscall_linux_386.go
+++ b/src/pkg/syscall/zsyscall_linux_386.go
@@ -273,14 +273,6 @@ func Fsync(fd int) (errno int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Ftruncate(fd int, length int64) (errno int) {
-       _, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
-       errno = int(e1)
-       return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Getdents(fd int, buf []byte) (n int, errno int) {
        var _p0 unsafe.Pointer
        if len(buf) > 0 {
@@ -645,14 +637,6 @@ func Times(tms *Tms) (ticks uintptr, errno int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Truncate(path string, length int64) (errno int) {
-       _, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), uintptr(length>>32))
-       errno = int(e1)
-       return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Umask(mask int) (oldmask int) {
        r0, _, _ := Syscall(SYS_UMASK, uintptr(mask), 0, 0)
        oldmask = int(r0)
@@ -772,6 +756,14 @@ func Fstat(fd int, stat *Stat_t) (errno int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Ftruncate(fd int, length int64) (errno int) {
+       _, _, e1 := Syscall(SYS_FTRUNCATE64, uintptr(fd), uintptr(length), uintptr(length>>32))
+       errno = int(e1)
+       return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getegid() (egid int) {
        r0, _, _ := Syscall(SYS_GETEGID32, 0, 0, 0)
        egid = int(r0)
@@ -934,6 +926,14 @@ func SyncFileRange(fd int, off int64, n int64, flags int) (errno int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Truncate(path string, length int64) (errno int) {
+       _, _, e1 := Syscall(SYS_TRUNCATE64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), uintptr(length>>32))
+       errno = int(e1)
+       return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func getgroups(n int, list *_Gid_t) (nn int, errno int) {
        r0, _, e1 := Syscall(SYS_GETGROUPS32, uintptr(n), uintptr(unsafe.Pointer(list)), 0)
        nn = int(r0)

diff --git a/src/pkg/syscall/zsyscall_linux_amd64.go b/src/pkg/syscall/zsyscall_linux_amd64.go
index d851d1e54af4aa962c37e5f90759b1980857c781..e08525be4d09d6eb058e480cb887d3fad1e69d19 100644 (file)
--- a/src/pkg/syscall/zsyscall_linux_amd64.go
+++ b/src/pkg/syscall/zsyscall_linux_amd64.go
@@ -273,14 +273,6 @@ func Fsync(fd int) (errno int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Ftruncate(fd int, length int64) (errno int) {
-       _, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
-       errno = int(e1)
-       return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Getdents(fd int, buf []byte) (n int, errno int) {
        var _p0 unsafe.Pointer
        if len(buf) > 0 {
@@ -645,14 +637,6 @@ func Times(tms *Tms) (ticks uintptr, errno int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Truncate(path string, length int64) (errno int) {
-       _, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), 0)
-       errno = int(e1)
-       return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Umask(mask int) (oldmask int) {
        r0, _, _ := Syscall(SYS_UMASK, uintptr(mask), 0, 0)
        oldmask = int(r0)
@@ -780,6 +764,14 @@ func Fstatfs(fd int, buf *Statfs_t) (errno int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Ftruncate(fd int, length int64) (errno int) {
+       _, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
+       errno = int(e1)
+       return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getegid() (egid int) {
        r0, _, _ := Syscall(SYS_GETEGID, 0, 0, 0)
        egid = int(r0)
@@ -984,6 +976,14 @@ func SyncFileRange(fd int, off int64, n int64, flags int) (errno int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Truncate(path string, length int64) (errno int) {
+       _, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), 0)
+       errno = int(e1)
+       return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, errno int) {
        r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
        fd = int(r0)

diff --git a/src/pkg/syscall/zsyscall_linux_arm.go b/src/pkg/syscall/zsyscall_linux_arm.go
index 03612a8ed1359a40d5bfba475a8d4159ebfd6256..22db0dfe4da49380d7189eef46708d97411620e0 100644 (file)
--- a/src/pkg/syscall/zsyscall_linux_arm.go
+++ b/src/pkg/syscall/zsyscall_linux_arm.go
@@ -273,14 +273,6 @@ func Fsync(fd int) (errno int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Ftruncate(fd int, length int64) (errno int) {
-       _, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), uintptr(length>>32))
-       errno = int(e1)
-       return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Getdents(fd int, buf []byte) (n int, errno int) {
        var _p0 unsafe.Pointer
        if len(buf) > 0 {
@@ -645,14 +637,6 @@ func Times(tms *Tms) (ticks uintptr, errno int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Truncate(path string, length int64) (errno int) {
-       _, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), uintptr(length>>32))
-       errno = int(e1)
-       return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Umask(mask int) (oldmask int) {
        r0, _, _ := Syscall(SYS_UMASK, uintptr(mask), 0, 0)
        oldmask = int(r0)
@@ -888,6 +872,14 @@ func Fstatfs(fd int, buf *Statfs_t) (errno int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Ftruncate(fd int, length int64) (errno int) {
+       _, _, e1 := Syscall(SYS_FTRUNCATE64, uintptr(fd), uintptr(length), uintptr(length>>32))
+       errno = int(e1)
+       return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getegid() (egid int) {
        r0, _, _ := Syscall(SYS_GETEGID, 0, 0, 0)
        egid = int(r0)
@@ -1033,6 +1025,14 @@ func Statfs(path string, buf *Statfs_t) (errno int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Truncate(path string, length int64) (errno int) {
+       _, _, e1 := Syscall(SYS_TRUNCATE64, uintptr(unsafe.Pointer(StringBytePtr(path))), uintptr(length), uintptr(length>>32))
+       errno = int(e1)
+       return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Gettimeofday(tv *Timeval) (errno int) {
        _, _, e1 := Syscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
        errno = int(e1)