Merge pull request #4372 from ipfs/feat/use-sys

switch from syscall to golang.org/x/sys

Author: whyrusleeping

cmd/ipfs/ulimit_freebsd.go

@@ -4,16 +4,17 @@ package main
 
 import (
 	"fmt"
-	"syscall"
+
+	unix "gx/ipfs/QmPXvegq26x982cQjSfbTvSzZXn7GiaMwhhVPHkeTEhrPT/sys/unix"
 )
 
 func init() {
 	fileDescriptorCheck = checkAndSetUlimit
 }
 
 func checkAndSetUlimit() error {
-	var rLimit syscall.Rlimit
-	err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
+	var rLimit unix.Rlimit
+	err := unix.Getrlimit(unix.RLIMIT_NOFILE, &rLimit)
 	if err != nil {
 		return fmt.Errorf("error getting rlimit: %s", err)
 	}
@@ -31,7 +32,7 @@ func checkAndSetUlimit() error {
 		setting = true
 	}
 
-	err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
+	err = unix.Setrlimit(unix.RLIMIT_NOFILE, &rLimit)
 	if err != nil {
 		return fmt.Errorf("error setting ulimit: %s", err)
 	}

cmd/ipfs/ulimit_unix.go

@@ -4,16 +4,17 @@ package main
 
 import (
 	"fmt"
-	"syscall"
+
+	unix "gx/ipfs/QmPXvegq26x982cQjSfbTvSzZXn7GiaMwhhVPHkeTEhrPT/sys/unix"
 )
 
 func init() {
 	fileDescriptorCheck = checkAndSetUlimit
 }
 
 func checkAndSetUlimit() error {
-	var rLimit syscall.Rlimit
-	err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
+	var rLimit unix.Rlimit
+	err := unix.Getrlimit(unix.RLIMIT_NOFILE, &rLimit)
 	if err != nil {
 		return fmt.Errorf("error getting rlimit: %s", err)
 	}
@@ -29,7 +30,7 @@ func checkAndSetUlimit() error {
 		setting = true
 	}
 
-	err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
+	err = unix.Setrlimit(unix.RLIMIT_NOFILE, &rLimit)
 	if err != nil {
 		return fmt.Errorf("error setting ulimit: %s", err)
 	}

fuse/node/mount_darwin.go

@@ -8,10 +8,10 @@ import (
 	"os/exec"
 	"runtime"
 	"strings"
-	"syscall"
 
 	core "github.com/ipfs/go-ipfs/core"
 
+	unix "gx/ipfs/QmPXvegq26x982cQjSfbTvSzZXn7GiaMwhhVPHkeTEhrPT/sys/unix"
 	"gx/ipfs/QmYRGECuvQnRX73fcvPnGbYijBcGN2HbKZQ7jh26qmLiHG/semver"
 )
 
@@ -165,7 +165,7 @@ func tryGFV() (string, error) {
 }
 
 func trySysctl() (string, error) {
-	v, err := syscall.Sysctl("osxfuse.version.number")
+	v, err := unix.Sysctl("osxfuse.version.number")
 	if err != nil {
 		log.Debug("mount: sysctl osxfuse.version.number:", "failed")
 		return "", err

package.json

@@ -497,6 +497,12 @@
       "hash": "QmeS8cCKawUwejVrsBtmC1toTXmwVWZGiRJqzgTURVWeF9",
       "name": "go-ipfs-addr",
       "version": "0.1.1"
+    },
+    {
+      "author": "The Go Authors",
+      "hash": "QmPXvegq26x982cQjSfbTvSzZXn7GiaMwhhVPHkeTEhrPT",
+      "name": "sys",
+      "version": "0.1.0"
     }
   ],
   "gxVersion": "0.10.0",