diff options
Diffstat (limited to 'src/cmd/hgpatch')
| -rw-r--r-- | src/cmd/hgpatch/Makefile | 2 | ||||
| -rw-r--r-- | src/cmd/hgpatch/main.go | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/cmd/hgpatch/Makefile b/src/cmd/hgpatch/Makefile index f7d64bc12..1ef98d7f9 100644 --- a/src/cmd/hgpatch/Makefile +++ b/src/cmd/hgpatch/Makefile @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style # license that can be found in the LICENSE file. -include ../../Make.$(GOARCH) +include ../../Make.inc TARG=hgpatch GOFILES=\ diff --git a/src/cmd/hgpatch/main.go b/src/cmd/hgpatch/main.go index f6ea36da8..bd4b563f9 100644 --- a/src/cmd/hgpatch/main.go +++ b/src/cmd/hgpatch/main.go @@ -153,7 +153,7 @@ func main() { changed[o.Dst] = 1 } if o.Mode != 0 { - chk(os.Chmod(o.Dst, o.Mode&0755)) + chk(os.Chmod(o.Dst, uint32(o.Mode&0755))) undoRevert(o.Dst) changed[o.Dst] = 1 } @@ -192,7 +192,7 @@ func makeParent(name string) { // Copy of os.MkdirAll but adds to undo log after // creating a directory. -func mkdirAll(path string, perm int) os.Error { +func mkdirAll(path string, perm uint32) os.Error { dir, err := os.Lstat(path) if err == nil { if dir.IsDirectory() { @@ -318,11 +318,9 @@ func hgRename(dst, src string) os.Error { return err } -func copy(a []string) []string { +func dup(a []string) []string { b := make([]string, len(a)) - for i, s := range a { - b[i] = s - } + copy(b, a) return b } @@ -379,7 +377,7 @@ func run(argv []string, input []byte) (out string, err os.Error) { return Error: - err = &runError{copy(argv), err} + err = &runError{dup(argv), err} return } |