code review 13183044: os: dragonfly support

os: dragonfly support

Make the os package build and work on dragonfly.

[jsing, 2013-08-23 16:01:52]

Hello bradfitz@golang.org (cc: golang-dev@googlegroups.com),

I'd like you to review this change to
https://go.googlecode.com/hg/

[bradfitz, 2013-08-23 16:04:13]

LGTM



On Fri, Aug 23, 2013 at 11:01 AM, <jsing@google.com> wrote:

> Reviewers: bradfitz,
>
> Message:
> Hello bradfitz@golang.org (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change to
> https://go.googlecode.com/hg/
>
>
> Description:
> os: dragonfly support
>
> Make the os package build and work on dragonfly.
>
> Please review this at
https://codereview.appspot.**com/13183044/<https://codereview.appspot.com/131...
>
> Affected files:
>   M src/pkg/os/dir_unix.go
>   M src/pkg/os/env_unix_test.go
>   M src/pkg/os/error_unix.go
>   M src/pkg/os/exec/exec_test.go
>   M src/pkg/os/exec/lp_unix.go
>   M src/pkg/os/exec/lp_unix_test.**go
>   M src/pkg/os/exec_posix.go
>   M src/pkg/os/exec_unix.go
>   M src/pkg/os/file_posix.go
>   M src/pkg/os/file_unix.go
>   M src/pkg/os/os_test.go
>   M src/pkg/os/os_unix_test.go
>   M src/pkg/os/path_unix.go
>   M src/pkg/os/pipe_bsd.go
>   M src/pkg/os/signal/signal_test.**go
>   M src/pkg/os/signal/signal_unix.**go
>   M src/pkg/os/stat_dragonfly.go
>   M src/pkg/os/sys_bsd.go
>
>
> Index: src/pkg/os/dir_unix.go
> ==============================**==============================**=======
> --- a/src/pkg/os/dir_unix.go
> +++ b/src/pkg/os/dir_unix.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd linux netbsd openbsd
> +// +build darwin dragonfly freebsd linux netbsd openbsd
>
>  package os
>
> Index: src/pkg/os/env_unix_test.go
> ==============================**==============================**=======
> --- a/src/pkg/os/env_unix_test.go
> +++ b/src/pkg/os/env_unix_test.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd linux netbsd openbsd
> +// +build darwin dragonfly freebsd linux netbsd openbsd
>
>  package os_test
>
> Index: src/pkg/os/error_unix.go
> ==============================**==============================**=======
> --- a/src/pkg/os/error_unix.go
> +++ b/src/pkg/os/error_unix.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd linux netbsd openbsd
> +// +build darwin dragonfly freebsd linux netbsd openbsd
>
>  package os
>
> Index: src/pkg/os/exec/exec_test.go
> ==============================**==============================**=======
> --- a/src/pkg/os/exec/exec_test.go
> +++ b/src/pkg/os/exec/exec_test.go
> @@ -445,7 +445,7 @@
>         // Determine which command to use to display open files.
>         ofcmd := "lsof"
>         switch runtime.GOOS {
> -       case "freebsd", "netbsd", "openbsd":
> +       case "dragonfly", "freebsd", "netbsd", "openbsd":
>                 ofcmd = "fstat"
>         }
>
> @@ -514,6 +514,9 @@
>                         os.Exit(1)
>                 }
>                 switch runtime.GOOS {
> +               case "dragonfly":
> +                       // TODO(jsing): Determine why DragonFly is leaking
> +                       // file descriptors...
>                 case "darwin":
>                         // TODO(bradfitz): broken? Sometimes.
>                         // http://golang.org/issue/2603
> Index: src/pkg/os/exec/lp_unix.go
> ==============================**==============================**=======
> --- a/src/pkg/os/exec/lp_unix.go
> +++ b/src/pkg/os/exec/lp_unix.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd linux netbsd openbsd
> +// +build darwin dragonfly freebsd linux netbsd openbsd
>
>  package exec
>
> Index: src/pkg/os/exec/lp_unix_test.**go
> ==============================**==============================**=======
> --- a/src/pkg/os/exec/lp_unix_**test.go
> +++ b/src/pkg/os/exec/lp_unix_**test.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd linux netbsd openbsd
> +// +build darwin dragonfly freebsd linux netbsd openbsd
>
>  package exec
>
> Index: src/pkg/os/exec_posix.go
> ==============================**==============================**=======
> --- a/src/pkg/os/exec_posix.go
> +++ b/src/pkg/os/exec_posix.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd linux netbsd openbsd windows
> +// +build darwin dragonfly freebsd linux netbsd openbsd windows
>
>  package os
>
> Index: src/pkg/os/exec_unix.go
> ==============================**==============================**=======
> --- a/src/pkg/os/exec_unix.go
> +++ b/src/pkg/os/exec_unix.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd linux netbsd openbsd
> +// +build darwin dragonfly freebsd linux netbsd openbsd
>
>  package os
>
> Index: src/pkg/os/file_posix.go
> ==============================**==============================**=======
> --- a/src/pkg/os/file_posix.go
> +++ b/src/pkg/os/file_posix.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd linux netbsd openbsd windows
> +// +build darwin dragonfly freebsd linux netbsd openbsd windows
>
>  package os
>
> Index: src/pkg/os/file_unix.go
> ==============================**==============================**=======
> --- a/src/pkg/os/file_unix.go
> +++ b/src/pkg/os/file_unix.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd linux netbsd openbsd
> +// +build darwin dragonfly freebsd linux netbsd openbsd
>
>  package os
>
> Index: src/pkg/os/os_test.go
> ==============================**==============================**=======
> --- a/src/pkg/os/os_test.go
> +++ b/src/pkg/os/os_test.go
> @@ -825,9 +825,16 @@
>                                 if !strings.HasSuffix(**syscallErrStr,
> expectedErrStr) {
>                                         t.Errorf("Open(%q, %d) = _, %q;
> want suffix %q", tt.path, tt.mode, syscallErrStr, expectedErrStr)
>                                 }
> -                       } else {
> -                               t.Errorf("Open(%q, %d) = _, %q; want %q",
> tt.path, tt.mode, perr.Err.Error(), tt.error.Error())
> +                               continue
>                         }
> +                       if runtime.GOOS == "dragonfly" {
> +                               // DragonFly incorrectly returns EACCES
> rather
> +                               // EISDIR when a directory is opened for
> write.
> +                               if tt.error == syscall.EISDIR && perr.Err
> == syscall.EACCES {
> +                                       continue
> +                               }
> +                       }
> +                       t.Errorf("Open(%q, %d) = _, %q; want %q", tt.path,
> tt.mode, perr.Err.Error(), tt.error.Error())
>                 }
>         }
>  }
> Index: src/pkg/os/os_unix_test.go
> ==============================**==============================**=======
> --- a/src/pkg/os/os_unix_test.go
> +++ b/src/pkg/os/os_unix_test.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd linux netbsd openbsd
> +// +build darwin dragonfly freebsd linux netbsd openbsd
>
>  package os_test
>
> Index: src/pkg/os/path_unix.go
> ==============================**==============================**=======
> --- a/src/pkg/os/path_unix.go
> +++ b/src/pkg/os/path_unix.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd linux netbsd openbsd
> +// +build darwin dragonfly freebsd linux netbsd openbsd
>
>  package os
>
> Index: src/pkg/os/pipe_bsd.go
> ==============================**==============================**=======
> --- a/src/pkg/os/pipe_bsd.go
> +++ b/src/pkg/os/pipe_bsd.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd netbsd openbsd
> +// +build darwin dragonfly freebsd netbsd openbsd
>
>  package os
>
> Index: src/pkg/os/signal/signal_test.**go
> ==============================**==============================**=======
> --- a/src/pkg/os/signal/signal_**test.go
> +++ b/src/pkg/os/signal/signal_**test.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd linux netbsd openbsd
> +// +build darwin dragonfly freebsd linux netbsd openbsd
>
>  package signal
>
> Index: src/pkg/os/signal/signal_unix.**go
> ==============================**==============================**=======
> --- a/src/pkg/os/signal/signal_**unix.go
> +++ b/src/pkg/os/signal/signal_**unix.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd linux netbsd openbsd windows
> +// +build darwin dragonfly freebsd linux netbsd openbsd windows
>
>  package signal
>
> Index: src/pkg/os/stat_dragonfly.go
> ==============================**==============================**=======
> copy from src/pkg/os/stat_freebsd.go
> copy to src/pkg/os/stat_dragonfly.go
> --- a/src/pkg/os/stat_freebsd.go
> +++ b/src/pkg/os/stat_dragonfly.go
> @@ -19,7 +19,7 @@
>         fs := &fileStat{
>                 name:    basename(name),
>                 size:    int64(st.Size),
> -               modTime: timespecToTime(st.Mtimespec),
> +               modTime: timespecToTime(st.Mtim),
>                 sys:     st,
>         }
>         fs.mode = FileMode(st.Mode & 0777)
> @@ -57,5 +57,5 @@
>
>  // For testing.
>  func atime(fi FileInfo) time.Time {
> -       return timespecToTime(fi.Sys().(***syscall.Stat_t).Atimespec)
> +       return timespecToTime(fi.Sys().(***syscall.Stat_t).Atim)
>  }
> Index: src/pkg/os/sys_bsd.go
> ==============================**==============================**=======
> --- a/src/pkg/os/sys_bsd.go
> +++ b/src/pkg/os/sys_bsd.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd netbsd openbsd
> +// +build darwin dragonfly freebsd netbsd openbsd
>
>  // os code shared between *BSD systems including OS X (Darwin)
>  // and FreeBSD.
>
>
>

[jsing, 2013-08-23 16:15:59]

*** Submitted as https://code.google.com/p/go/source/detail?r=5f799622d83a ***

os: dragonfly support

Make the os package build and work on dragonfly.

R=bradfitz
CC=golang-dev
https://codereview.appspot.com/13183044