You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by vi...@apache.org on 2016/10/12 01:25:23 UTC
incubator-mynewt-newt git commit: Revendor to get gatt changes
Repository: incubator-mynewt-newt
Updated Branches:
refs/heads/develop 8c9a814a9 -> dda67b09a
Revendor to get gatt changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/commit/dda67b09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/dda67b09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/dda67b09
Branch: refs/heads/develop
Commit: dda67b09a3915fa17c13d0759fe2f3fc8944f31b
Parents: 8c9a814
Author: Vipul Rahane <vi...@apache.org>
Authored: Tue Oct 11 17:37:29 2016 -0700
Committer: Vipul Rahane <vi...@apache.org>
Committed: Tue Oct 11 17:38:01 2016 -0700
----------------------------------------------------------------------
newtmgr/Godeps/Godeps.json | 32 ++++++++++----------
.../github.com/runtimeinc/gatt/device_darwin.go | 8 +++++
.../github.com/spf13/pflag/string_array.go | 3 +-
.../golang.org/x/sys/unix/syscall_linux.go | 18 +++++------
.../golang.org/x/sys/unix/zsyscall_linux_386.go | 6 ++--
.../x/sys/unix/zsyscall_linux_amd64.go | 6 ++--
.../golang.org/x/sys/unix/zsyscall_linux_arm.go | 6 ++--
.../x/sys/unix/zsyscall_linux_arm64.go | 6 ++--
.../x/sys/unix/zsyscall_linux_mips64.go | 6 ++--
.../x/sys/unix/zsyscall_linux_mips64le.go | 6 ++--
.../x/sys/unix/zsyscall_linux_ppc64.go | 6 ++--
.../x/sys/unix/zsyscall_linux_ppc64le.go | 6 ++--
.../vendor/mynewt.apache.org/newt/util/util.go | 26 ++++++++++++++--
13 files changed, 80 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dda67b09/newtmgr/Godeps/Godeps.json
----------------------------------------------------------------------
diff --git a/newtmgr/Godeps/Godeps.json b/newtmgr/Godeps/Godeps.json
index 87a4d9b..a80d598 100644
--- a/newtmgr/Godeps/Godeps.json
+++ b/newtmgr/Godeps/Godeps.json
@@ -35,35 +35,35 @@
},
{
"ImportPath": "github.com/runtimeinc/gatt",
- "Rev": "e559c7ba05f6cc18349eb06b3f65e0a9eb1b22f7"
+ "Rev": "a8b4c64987af1491ef629e5ec45d3fc47df29eb9"
},
{
"ImportPath": "github.com/runtimeinc/gatt/linux",
- "Rev": "e559c7ba05f6cc18349eb06b3f65e0a9eb1b22f7"
+ "Rev": "a8b4c64987af1491ef629e5ec45d3fc47df29eb9"
},
{
"ImportPath": "github.com/runtimeinc/gatt/linux/cmd",
- "Rev": "e559c7ba05f6cc18349eb06b3f65e0a9eb1b22f7"
+ "Rev": "a8b4c64987af1491ef629e5ec45d3fc47df29eb9"
},
{
"ImportPath": "github.com/runtimeinc/gatt/linux/evt",
- "Rev": "e559c7ba05f6cc18349eb06b3f65e0a9eb1b22f7"
+ "Rev": "a8b4c64987af1491ef629e5ec45d3fc47df29eb9"
},
{
"ImportPath": "github.com/runtimeinc/gatt/linux/gioctl",
- "Rev": "e559c7ba05f6cc18349eb06b3f65e0a9eb1b22f7"
+ "Rev": "a8b4c64987af1491ef629e5ec45d3fc47df29eb9"
},
{
"ImportPath": "github.com/runtimeinc/gatt/linux/socket",
- "Rev": "e559c7ba05f6cc18349eb06b3f65e0a9eb1b22f7"
+ "Rev": "a8b4c64987af1491ef629e5ec45d3fc47df29eb9"
},
{
"ImportPath": "github.com/runtimeinc/gatt/linux/util",
- "Rev": "e559c7ba05f6cc18349eb06b3f65e0a9eb1b22f7"
+ "Rev": "a8b4c64987af1491ef629e5ec45d3fc47df29eb9"
},
{
"ImportPath": "github.com/runtimeinc/gatt/xpc",
- "Rev": "e559c7ba05f6cc18349eb06b3f65e0a9eb1b22f7"
+ "Rev": "a8b4c64987af1491ef629e5ec45d3fc47df29eb9"
},
{
"ImportPath": "github.com/spf13/cast",
@@ -79,7 +79,7 @@
},
{
"ImportPath": "github.com/spf13/pflag",
- "Rev": "b83537d79690b75cac5e021b036ae16792bf0f20"
+ "Rev": "bf8481a6aebc13a8aab52e699ffe2e79771f5a3f"
},
{
"ImportPath": "github.com/tarm/serial",
@@ -91,7 +91,7 @@
},
{
"ImportPath": "golang.org/x/sys/unix",
- "Rev": "67f277b6fe017c42fc3b4a445edc999dd99edd58"
+ "Rev": "9bb9f0998d48b31547d975974935ae9b48c7a03c"
},
{
"ImportPath": "gopkg.in/fsnotify.v1",
@@ -100,18 +100,18 @@
},
{
"ImportPath": "mynewt.apache.org/newt/util",
- "Comment": "pre_sterly_refactor-40-ge56049b",
- "Rev": "e56049b237d9fed510d92024358e4dc16a944b56"
+ "Comment": "pre_sterly_refactor-45-g881df6a",
+ "Rev": "881df6a00e22b8b121e34bd6804bebc9ae28b68a"
},
{
"ImportPath": "mynewt.apache.org/newt/viper",
- "Comment": "pre_sterly_refactor-40-ge56049b",
- "Rev": "e56049b237d9fed510d92024358e4dc16a944b56"
+ "Comment": "pre_sterly_refactor-45-g881df6a",
+ "Rev": "881df6a00e22b8b121e34bd6804bebc9ae28b68a"
},
{
"ImportPath": "mynewt.apache.org/newt/yaml",
- "Comment": "pre_sterly_refactor-40-ge56049b",
- "Rev": "e56049b237d9fed510d92024358e4dc16a944b56"
+ "Comment": "pre_sterly_refactor-45-g881df6a",
+ "Rev": "881df6a00e22b8b121e34bd6804bebc9ae28b68a"
}
]
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dda67b09/newtmgr/vendor/github.com/runtimeinc/gatt/device_darwin.go
----------------------------------------------------------------------
diff --git a/newtmgr/vendor/github.com/runtimeinc/gatt/device_darwin.go b/newtmgr/vendor/github.com/runtimeinc/gatt/device_darwin.go
index 174cb97..5401057 100644
--- a/newtmgr/vendor/github.com/runtimeinc/gatt/device_darwin.go
+++ b/newtmgr/vendor/github.com/runtimeinc/gatt/device_darwin.go
@@ -359,6 +359,14 @@ func (d *device) respondToRequest(id int, args xpc.Dict) {
}
}
+/*
+ * OSX GATT library currently doesn't work for Mynewt, so adding this stub to keep
+ * it buildable for OSX.
+ */
+func (d *device) Stop() error {
+ return nil
+}
+
func (d *device) CancelConnection(p Peripheral) {
d.sendCmd(32, xpc.Dict{"kCBMsgArgDeviceUUID": p.(*peripheral).id})
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dda67b09/newtmgr/vendor/github.com/spf13/pflag/string_array.go
----------------------------------------------------------------------
diff --git a/newtmgr/vendor/github.com/spf13/pflag/string_array.go b/newtmgr/vendor/github.com/spf13/pflag/string_array.go
index f320f2e..93b4e43 100644
--- a/newtmgr/vendor/github.com/spf13/pflag/string_array.go
+++ b/newtmgr/vendor/github.com/spf13/pflag/string_array.go
@@ -2,7 +2,6 @@ package pflag
import (
"fmt"
- "strings"
)
var _ = fmt.Fprint
@@ -40,7 +39,7 @@ func (s *stringArrayValue) String() string {
}
func stringArrayConv(sval string) (interface{}, error) {
- sval = strings.Trim(sval, "[]")
+ sval = sval[1 : len(sval)-1]
// An empty string would cause a array with one (empty) string
if len(sval) == 0 {
return []string{}, nil
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dda67b09/newtmgr/vendor/golang.org/x/sys/unix/syscall_linux.go
----------------------------------------------------------------------
diff --git a/newtmgr/vendor/golang.org/x/sys/unix/syscall_linux.go b/newtmgr/vendor/golang.org/x/sys/unix/syscall_linux.go
index 46ace86..cfac4a4 100644
--- a/newtmgr/vendor/golang.org/x/sys/unix/syscall_linux.go
+++ b/newtmgr/vendor/golang.org/x/sys/unix/syscall_linux.go
@@ -69,10 +69,10 @@ func Ppoll(fds []PollFd, timeout *Timespec, sigmask *Sigset_t) (n int, err error
return ppoll(&fds[0], len(fds), timeout, sigmask)
}
-//sys readlinkat(dirfd int, path string, buf []byte) (n int, err error)
+//sys Readlinkat(dirfd int, path string, buf []byte) (n int, err error)
func Readlink(path string, buf []byte) (n int, err error) {
- return readlinkat(AT_FDCWD, path, buf)
+ return Readlinkat(AT_FDCWD, path, buf)
}
func Rename(oldpath string, newpath string) (err error) {
@@ -80,24 +80,20 @@ func Rename(oldpath string, newpath string) (err error) {
}
func Rmdir(path string) error {
- return unlinkat(AT_FDCWD, path, AT_REMOVEDIR)
+ return Unlinkat(AT_FDCWD, path, AT_REMOVEDIR)
}
-//sys symlinkat(oldpath string, newdirfd int, newpath string) (err error)
+//sys Symlinkat(oldpath string, newdirfd int, newpath string) (err error)
func Symlink(oldpath string, newpath string) (err error) {
- return symlinkat(oldpath, AT_FDCWD, newpath)
+ return Symlinkat(oldpath, AT_FDCWD, newpath)
}
func Unlink(path string) error {
- return unlinkat(AT_FDCWD, path, 0)
+ return Unlinkat(AT_FDCWD, path, 0)
}
-//sys unlinkat(dirfd int, path string, flags int) (err error)
-
-func Unlinkat(dirfd int, path string, flags int) error {
- return unlinkat(dirfd, path, flags)
-}
+//sys Unlinkat(dirfd int, path string, flags int) (err error)
//sys utimes(path string, times *[2]Timeval) (err error)
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dda67b09/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
----------------------------------------------------------------------
diff --git a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
index 1f7a756..80f6a1b 100644
--- a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
+++ b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dda67b09/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
----------------------------------------------------------------------
diff --git a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
index b4e24fc..078c8f0 100644
--- a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
+++ b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dda67b09/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
----------------------------------------------------------------------
diff --git a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
index 20bf33c..76e5f7c 100644
--- a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
+++ b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dda67b09/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
----------------------------------------------------------------------
diff --git a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
index c7286db..72b7947 100644
--- a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
+++ b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dda67b09/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
----------------------------------------------------------------------
diff --git a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
index b709ed2..ba55509 100644
--- a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
+++ b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dda67b09/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
----------------------------------------------------------------------
diff --git a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
index 5cb1c56..2b1cc84 100644
--- a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
+++ b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dda67b09/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
----------------------------------------------------------------------
diff --git a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
index 873bb18..25f39db 100644
--- a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
+++ b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dda67b09/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
----------------------------------------------------------------------
diff --git a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
index bf08835..70702b5 100644
--- a/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
+++ b/newtmgr/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dda67b09/newtmgr/vendor/mynewt.apache.org/newt/util/util.go
----------------------------------------------------------------------
diff --git a/newtmgr/vendor/mynewt.apache.org/newt/util/util.go b/newtmgr/vendor/mynewt.apache.org/newt/util/util.go
index 2cda3e8..4aae5a7 100644
--- a/newtmgr/vendor/mynewt.apache.org/newt/util/util.go
+++ b/newtmgr/vendor/mynewt.apache.org/newt/util/util.go
@@ -363,12 +363,17 @@ func CopyFile(srcFile string, dstFile string) error {
}
defer in.Close()
+ info, err := in.Stat()
+ if err != nil {
+ return ChildNewtError(err)
+ }
+
dstDir := filepath.Dir(dstFile)
if err := os.MkdirAll(dstDir, os.ModePerm); err != nil {
return ChildNewtError(err)
}
- out, err := os.Create(dstFile)
+ out, err := os.OpenFile(dstFile, os.O_CREATE|os.O_WRONLY, info.Mode())
if err != nil {
return ChildNewtError(err)
}
@@ -394,7 +399,12 @@ func CopyDir(srcDirStr, dstDirStr string) error {
return ChildNewtError(err)
}
- if err := os.MkdirAll(filepath.Dir(dstDirStr), os.ModePerm); err != nil {
+ info, err := srcDir.Stat()
+ if err != nil {
+ return ChildNewtError(err)
+ }
+
+ if err := os.MkdirAll(filepath.Dir(dstDirStr), info.Mode()); err != nil {
return ChildNewtError(err)
}
@@ -420,6 +430,18 @@ func CopyDir(srcDirStr, dstDirStr string) error {
return nil
}
+func MoveFile(srcFile string, destFile string) error {
+ if err := CopyFile(srcFile, destFile); err != nil {
+ return err
+ }
+
+ if err := os.RemoveAll(srcFile); err != nil {
+ return err
+ }
+
+ return nil
+}
+
// Reads each line from the specified text file into an array of strings. If a
// line ends with a backslash, it is concatenated with the following line.
func ReadLines(path string) ([]string, error) {