doc: Add paragraph about mkdocs

.github/ISSUE_TEMPLATE/Bug.md

@@ -1,93 +0,0 @@
----
-name: Bug report
-about: Report a problem with restic to help us resolve it and improve
----
-
-<!--
-
-Welcome! - We kindly ask that you:
-
-  1. Fill out the issue template below - not doing so needs a good reason.
-  2. Use the forum if you have a question rather than a bug or feature request.
-
-The forum is at: https://forum.restic.net
-
-NOTE: Not filling out the issue template needs a good reason, as otherwise it
-may take a lot longer to find the problem, not to mention it can take up a lot
-more time which can otherwise be spent on development. Please also take the
-time to help us debug the issue by collecting relevant information, even if
-it doesn't seem to be relevant to you. Thanks!
-
-The forum is a better place for questions about restic or general suggestions
-and topics, e.g. usage or documentation questions! This issue tracker is mainly
-for tracking bugs and feature requests directly relating to the development of
-the software itself, rather than the project.
-
-Thanks for understanding, and for contributing to the project!
-
--->
-
-
-Output of `restic version`
---------------------------
-
-
-How did you run restic exactly?
--------------------------------
-
-<!--
-This section should include at least:
-
- * The complete command line and any environment variables you used to
-   configure restic's backend access. Make sure to replace sensitive values!
-
- * The output of the commands, what restic prints gives may give us much
-   information to diagnose the problem!
--->
-
-What backend/server/service did you use to store the repository?
-----------------------------------------------------------------
-
-
-
-Expected behavior
------------------
-
-<!--
-Describe what you'd like restic to do differently.
--->
-
-Actual behavior
----------------
-
-<!--
-In this section, please try to concentrate on observations, so only describe
-what you observed directly.
--->
-
-Steps to reproduce the behavior
--------------------------------
-
-<!--
-The more time you spend describing an easy way to reproduce the behavior (if
-this is possible), the easier it is for the project developers to fix it!
--->
-
-Do you have any idea what may have caused this?
------------------------------------------------
-
-
-
-Do you have an idea how to solve the issue?
--------------------------------------------
-
-
-
-Did restic help you or made you happy in any way?
--------------------------------------------------
-
-<!--
-Answering this question is not required, but if you have anything positive to share, please do so here!
-Sometimes we get tired of reading bug reports all day and a little positive end note does wonders.
-Idea by Joey Hess, https://joeyh.name/blog/entry/two_holiday_stories/
--->

.github/ISSUE_TEMPLATE/Feature.md

@@ -1,57 +0,0 @@
----
-name: Feature request
-about: Suggest a new feature or enhancement for restic
----
-
-<!--
-
-Welcome! - We kindly ask that you:
-
-  1. Fill out the issue template below - not doing so needs a good reason.
-  2. Use the forum if you have a question rather than a bug or feature request.
-
-The forum is at: https://forum.restic.net
-
-The forum is a better place for questions about restic or general suggestions
-and topics, e.g. usage or documentation questions! This issue tracker is mainly
-for tracking bugs and feature requests directly relating to the development of
-the software itself, rather than the project.
-
-Thanks for understanding, and for contributing to the project!
-
--->
-
-
-Output of `restic version`
---------------------------
-
-<!--
-Please add the version of restic you're currently using here, this helps us
-later to see what has changed in restic when we revisit this issue after some
-time.
--->
-
-What should restic do differently? Which functionality do you think we should add?
-----------------------------------------------------------------------------------
-
-<!--
-Please describe the feature you'd like us to add here.
--->
-
-
-What are you trying to do?
---------------------------
-
-<!--
-This section should contain a brief description what you're trying to do, which
-would be possible after implementing the new feature.
--->
-
-Did restic help you or made you happy in any way?
--------------------------------------------------
-
-<!--
-Answering this question is not required, but if you have anything positive to share, please do so here!
-Sometimes we get tired of reading bug reports all day and a little positive end note does wonders.
-Idea by Joey Hess, https://joeyh.name/blog/entry/two_holiday_stories/
--->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,36 +0,0 @@
-
-
-<!--
-Thank you very much for contributing code or documentation to restic! Please
-fill out the following questions to make it easier for us to review your
-changes.
-
-You do not need to check all the boxes below all at once, feel free to take
-your time and add more commits. If you're done and ready for review, please
-check the last box.
--->
-
-What is the purpose of this change? What does it change?
---------------------------------------------------------
-
-<!--
-Describe the changes here, as detailed as needed.
--->
-
-Was the change discussed in an issue or in the forum before?
-------------------------------------------------------------
-
-<!--
-Link issues and relevant forum posts here.
--->
-
-Checklist
----------
-
-- [ ] I have read the [Contribution Guidelines](https://github.com/restic/restic/blob/master/CONTRIBUTING.md#providing-patches)
-- [ ] I have added tests for all changes in this PR
-- [ ] I have added documentation for the changes (in the manual)
-- [ ] There's a new file in `changelog/unreleased/` that describes the changes for our users (template [here](https://github.com/restic/restic/blob/master/changelog/TEMPLATE))
-- [ ] I have run `gofmt` on the code in all commits
-- [ ] All commit messages are formatted in the same style as [the other commits in the repo](https://github.com/restic/restic/blob/master/CONTRIBUTING.md#git-commits)
-- [ ] I'm done, this Pull Request is ready for review

.gitignore

@@ -1,3 +1,8 @@
+/.gopath
 /restic
+/restic.debug
+/dirdiff
+cmd/dirdiff/dirdiff
+cmd/gentestdata/gentestdata
+cmd/restic/restic
 /.vagrant
-/doc/_build

.hound.yml

@@ -1,2 +0,0 @@
-go:
-  enabled: true

.travis.yml

@@ -1,24 +1,14 @@
 language: go
 sudo: false
 
-matrix:
-  include:
-    - os: linux
-      go: "1.9.x"
-      env: RESTIC_TEST_FUSE=0 RESTIC_TEST_CLOUD_BACKENDS=0 RESTIC_BUILD_SOLARIS=0
+go:
+  - 1.3.3
+  - 1.4.2
+  - 1.5
 
-    # only run fuse and cloud backends tests on Travis for the latest Go on Linux
-    - os: linux
-      go: "1.10.x"
-      sudo: true
-
-    - os: osx
-      go: "1.10.x"
-      env: RESTIC_TEST_FUSE=0 RESTIC_TEST_CLOUD_BACKENDS=0
-
-branches:
-  only:
-    - master
+os:
+  - linux
+  - osx
 
 notifications:
   irc:
@@ -32,10 +22,11 @@ install:
   - go version
   - export GOBIN="$GOPATH/bin"
   - export PATH="$PATH:$GOBIN"
+  - export GOPATH="$GOPATH:${TRAVIS_BUILD_DIR}/Godeps/_workspace"
   - go env
 
 script:
   - go run run_integration_tests.go
 
 after_success:
-  - bash <(curl -s https://codecov.io/bash) -f all.cov
+  - goveralls -coverprofile=all.cov -service=travis-ci -repotoken "$COVERALLS_TOKEN" || true

CONTRIBUTING.md

@@ -3,10 +3,7 @@ This document describes the way you can contribute to the restic project.
 Ways to Help Out
 ================
 
-Thank you for your contribution! Please **open an issue first** (or add a
-comment to an existing issue) if you plan to work on any code or add a new
-feature. This way, duplicate work is prevented and we can discuss your ideas
-and design first.
+Thank you for your contribution!
 
 There are several ways you can help us out. First of all code contributions and
 bug fixes are most welcome. However even "minor" details as fixing spelling
@@ -28,67 +25,50 @@ those tagged
 [minor complexity](https://github.com/restic/restic/labels/minor%20complexity).
 
 
-Reporting Bugs
-==============
-
-You've found a bug? Thanks for letting us know so we can fix it! It is a good
-idea to describe in detail how to reproduce the bug (when you know how), what
-environment was used and so on. Please tell us at least the following things:
-
- * What's the version of restic you used? Please include the output of
-   `restic version` in your bug report.
- * What commands did you execute to get to where the bug occurred?
- * What did you expect?
- * What happened instead?
- * Are you aware of a way to reproduce the bug?
-
-Remember, the easier it is for us to reproduce the bug, the earlier it will be
-corrected!
-
-In addition, you can compile restic with debug support by running
-`go run build.go -tags debug` and instructing it to create a debug log by
-setting the environment variable `DEBUG_LOG` to a file, e.g. like this:
-
-    $ export DEBUG_LOG=/tmp/restic-debug.log
-    $ restic backup ~/work
-
-Please be aware that the debug log file will contain potentially sensitive
-things like file and directory names, so please either redact it before
-uploading it somewhere or post only the parts that are really relevant.
-
-
 Development Environment
 =======================
 
-In order to compile restic with the `go` tool directly, it needs to be checked
-out at the right path within a `GOPATH`. The concept of a `GOPATH` is explained
-in ["How to write Go code"](https://golang.org/doc/code.html).
+For development, it is recommended to check out the restic repository within a
+`GOPATH`, an introductory text is
+["How to Write Go Code"](https://golang.org/doc/code.html). It is recommended
+to have a working directory, we're using `~/work/restic` in the following. This
+directory mainly contains the directory `src`, where the source code is stored.
 
-If you do not have a directory with Go code yet, executing the following
-instructions in your shell will create one for you and check out the restic
-repo:
+First, create the necessary directory structure and clone the restic repository
+to the correct location:
 
-    $ export GOPATH="$HOME/go"
-    $ mkdir -p "$GOPATH/src/github.com/restic"
-    $ cd "$GOPATH/src/github.com/restic"
+    $ mkdir --parents ~/work/restic/src/github.com/restic
+    $ cd ~/work/restic/src/github.com/restic
     $ git clone https://github.com/restic/restic
     $ cd restic
 
-You can then build restic as follows:
+Now we're in the main directory of the restic repository. The last step is to
+set the environment variable `$GOPATH` to the correct value:
 
-    $ go build ./cmd/restic
-    $ ./restic version
-    restic compiled manually
-    compiled with go1.8.3 on linux/amd64
+    $ export GOPATH=~/work/restic:~/work/restic/src/github.com/restic/restic/Godeps/_workspace
 
 The following commands can be used to run all the tests:
 
-    $ go test ./cmd/... ./internal/...
+    $ go test ./...
+    ok          github.com/restic/restic        8.174s
+    [...]
 
-The repository contains two sets of directories with code: `cmd/` and
-`internal/` contain the code written for restic, whereas `vendor/` contains
-copies of libraries restic depends on. The libraries are managed with the
-[`dep`](https://github.com/golang/dep) tool.
+The restic binary can be built from the directory `cmd/restic` this way:
+
+    $ cd cmd/restic
+    $ go build
+    $ ./restic version
+    restic compiled manually on go1.4.2
+
+if you want to run your tests on Linux, OpenBSD or FreeBSD, you can use
+[vagrant](https://www.vagrantup.com/) with the proveded `Vagrantfile` to
+quickly set up VMs and run the tests, e.g.:
+
+    $ vagrant up freebsd
+    [...]
+
+    $ vagrant ssh freebsd -c 'cd restic/restic; go test -v ./...'
+    [...]
 
 Providing Patches
 =================
@@ -98,40 +78,23 @@ get it into the project! The workflow we're using is also described on the
 [GitHub Flow](https://guides.github.com/introduction/flow/) website, it boils
 down to the following steps:
 
- 0. If you want to work on something, please add a comment to the issue on
-    GitHub. For a new feature, please add an issue before starting to work on
-    it, so that duplicate work is prevented.
-
  1. First we would kindly ask you to fork our project on GitHub if you haven't
     done so already.
-
  2. Clone the repository locally and create a new branch. If you are working on
     the code itself, please set up the development environment as described in
-    the previous section. Especially take care to place your forked repository
-    at the correct path (`src/github.com/restic/restic`) within your `GOPATH`.
-
+    the previous section and instead of cloning add your fork on GitHub as a
+    remote to the clone of the restic repository.
  3. Then commit your changes as fine grained as possible, as smaller patches,
     that handle one and only one issue are easier to discuss and merge.
-
  4. Push the new branch with your changes to your fork of the repository.
-
  5. Create a pull request by visiting the GitHub website, it will guide you
     through the process.
-
  6. You will receive comments on your code and the feature or bug that they
     address. Maybe you need to rework some minor things, in this case push new
-    commits to the branch you created for the pull request (or amend the
-    existing commit, use common sense to decide which is better), they will be
+    commits to the branch you created for the pull request, they will be
     automatically added to the pull request.
-
- 7. If your pull request changes anything that users should be aware of (a
-    bugfix, a new feature, ...) please add an entry to the file
-    ['CHANGELOG.md'](CHANGELOG.md). It will be used in the announcement of the
-    next stable release. While writing, ask yourself: If I were the user, what
-    would I need to be aware of with this change.
-
- 8. Once your code looks good and passes all the tests, we'll merge it. Thanks
-    a lot for your contribution!
+ 7. Once your code looks good, we'll merge it. Thanks a low for your
+    contribution!
 
 Please provide the patches for each bug or feature in a separate branch and
 open up a pull request for each.
@@ -146,25 +109,17 @@ in the project root directory before committing. Installing the script
 pre-commit hook checks formatting before committing automatically, just copy
 this script to `.git/hooks/pre-commit`.
 
-For each pull request, several different systems run the integration tests on
-Linux, OS X and Windows. We won't merge any code that does not pass all tests
-for all systems, so when a tests fails, try to find out what's wrong and fix
-it. If you need help on this, please leave a comment in the pull request, and
-we'll be glad to assist. Having a PR with failing integration tests is nothing
-to be ashamed of. In contrast, that happens regularly for all of us. That's
-what the tests are there for.
-
 Git Commits
 -----------
 
-It would be good if you could follow the same general style regarding Git
+I would be good if you could follow the same general style regarding Git
 commits as the rest of the project, this makes reviewing code, browsing the
 history and triaging bugs much easier.
 
 Git commit messages have a very terse summary in the first line of the commit
 message, followed by an empty line, followed by a more verbose description or a
 List of changed things. For examples, please refer to the excellent [How to
-Write a Git Commit Message](https://chris.beams.io/posts/git-commit/).
+Write a Git Commit Message](http://chris.beams.io/posts/git-commit/).
 
 If you change/add multiple different things that aren't related at all, try to
 make several smaller commits. This is much easier to review. Using `git add -p`

GOVERNANCE.md

@@ -1,27 +0,0 @@
-# restic project governance
-
-## Overview
-
-The restic project uses a governance model commonly described as Benevolent
-Dictator For Life (BDFL). This document outlines our understanding of what this
-means. It is derived from the [i3 window manager project
-governance](https://raw.githubusercontent.com/i3/i3/next/.github/GOVERNANCE.md).
-
-## Roles
-
-* user: anyone who interacts with the restic project
-* core contributor: a handful of people who have contributed significantly to
-  the project by any means (issue triage, support, documentation, code, etc.).
-  Core contributors are recognizable via GitHub’s "Member" badge.
-* Benevolent Dictator For Life (BDFL): a single individual who makes decisions
-  when consensus cannot be reached. restic's current BDFL is [@fd0](https://github.com/fd0).
-
-## Decision making process
-
-In general, we try to reach consensus in discussions. In case consensus cannot
-be reached, the BDFL makes a decision.
-
-## Contribution process
-
-The contribution process is described in a separate document called
-[CONTRIBUTING](CONTRIBUTING.md).

Godeps/Godeps.json

@@ -0,0 +1,62 @@
+{
+	"ImportPath": "github.com/restic/restic",
+	"GoVersion": "go1.4.2",
+	"Packages": [
+		"./..."
+	],
+	"Deps": [
+		{
+			"ImportPath": "bazil.org/fuse",
+			"Rev": "18419ee53958df28fcfc9490fe6123bd59e237bb"
+		},
+		{
+			"ImportPath": "github.com/jessevdk/go-flags",
+			"Comment": "v1-297-g1b89bf7",
+			"Rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"
+		},
+		{
+			"ImportPath": "github.com/juju/errors",
+			"Rev": "4567a5e69fd3130ca0d89f69478e7ac025b67452"
+		},
+		{
+			"ImportPath": "github.com/kr/fs",
+			"Rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b"
+		},
+		{
+			"ImportPath": "github.com/mitchellh/goamz/aws",
+			"Rev": "caaaea8b30ee15616494ee68abd5d8ebbbef05cf"
+		},
+		{
+			"ImportPath": "github.com/mitchellh/goamz/s3",
+			"Rev": "caaaea8b30ee15616494ee68abd5d8ebbbef05cf"
+		},
+		{
+			"ImportPath": "github.com/pkg/sftp",
+			"Rev": "518aed2757a65cfa64d4b1b2baf08410f8b7a6bc"
+		},
+		{
+			"ImportPath": "github.com/restic/chunker",
+			"Rev": "e795b80f4c927ebcf2687ce18bcf1a39fee740b1"
+		},
+		{
+			"ImportPath": "github.com/vaughan0/go-ini",
+			"Rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"
+		},
+		{
+			"ImportPath": "golang.org/x/crypto/pbkdf2",
+			"Rev": "cc04154d65fb9296747569b107cfd05380b1ea3e"
+		},
+		{
+			"ImportPath": "golang.org/x/crypto/poly1305",
+			"Rev": "cc04154d65fb9296747569b107cfd05380b1ea3e"
+		},
+		{
+			"ImportPath": "golang.org/x/crypto/scrypt",
+			"Rev": "cc04154d65fb9296747569b107cfd05380b1ea3e"
+		},
+		{
+			"ImportPath": "golang.org/x/crypto/ssh",
+			"Rev": "cc04154d65fb9296747569b107cfd05380b1ea3e"
+		}
+	]
+}

Godeps/Readme

@@ -0,0 +1,5 @@
+This directory tree is generated automatically by godep.
+
+Please do not edit.
+
+See https://github.com/tools/godep for more information.

Godeps/_workspace/.gitignore

@@ -0,0 +1,2 @@
+/pkg
+/bin

Godeps/_workspace/src/bazil.org/fuse/doc/.gitignore

@@ -0,0 +1,4 @@
+/*.seq.svg
+
+# not ignoring *.seq.png; we want those committed to the repo
+# for embedding on Github

Godeps/_workspace/src/bazil.org/fuse/doc/README.md

@@ -0,0 +1,6 @@
+# bazil.org/fuse documentation
+
+See also API docs at http://godoc.org/bazil.org/fuse
+
+- [The mount sequence](mount-sequence.md)
+- [Writing documentation](writing-docs.md)

Godeps/_workspace/src/bazil.org/fuse/doc/mount-linux-error-init.seq

@@ -0,0 +1,32 @@
+seqdiag {
+  app;
+  fuse [label="bazil.org/fuse"];
+  fusermount;
+  kernel;
+  mounts;
+
+  app;
+  fuse [label="bazil.org/fuse"];
+  fusermount;
+  kernel;
+  mounts;
+
+  app -> fuse [label="Mount"];
+  fuse -> fusermount [label="spawn, pass socketpair fd"];
+  fusermount -> kernel [label="open /dev/fuse"];
+  fusermount -> kernel [label="mount(2)"];
+  kernel ->> mounts [label="mount is visible"];
+  fusermount <-- kernel [label="mount(2) returns"];
+  fuse <<-- fusermount [diagonal, label="exit, receive /dev/fuse fd", leftnote="on Linux, successful exit here\nmeans the mount has happened,\nthough InitRequest might not have yet"];
+  app <-- fuse [label="Mount returns\nConn.Ready is already closed"];
+
+  app -> fuse [label="fs.Serve"];
+  fuse => kernel [label="read /dev/fuse fd", note="starts with InitRequest"];
+  fuse -> app [label="Init"];
+  fuse <-- app [color=red];
+  fuse -> kernel [label="write /dev/fuse fd", color=red];
+  kernel -> kernel [label="set connection\nstate to error", color=red];
+  fuse <-- kernel;
+  ... conn.MountError == nil, so it is still mounted ...
+  ... call conn.Close to clean up ...
+}

Godeps/_workspace/src/bazil.org/fuse/doc/mount-linux.seq

@@ -0,0 +1,41 @@
+seqdiag {
+  // seqdiag -T svg -o doc/mount-osx.svg doc/mount-osx.seq
+  app;
+  fuse [label="bazil.org/fuse"];
+  fusermount;
+  kernel;
+  mounts;
+
+  app -> fuse [label="Mount"];
+  fuse -> fusermount [label="spawn, pass socketpair fd"];
+  fusermount -> kernel [label="open /dev/fuse"];
+  fusermount -> kernel [label="mount(2)"];
+  kernel ->> mounts [label="mount is visible"];
+  fusermount <-- kernel [label="mount(2) returns"];
+  fuse <<-- fusermount [diagonal, label="exit, receive /dev/fuse fd", leftnote="on Linux, successful exit here\nmeans the mount has happened,\nthough InitRequest might not have yet"];
+  app <-- fuse [label="Mount returns\nConn.Ready is already closed", rightnote="InitRequest and StatfsRequest\nmay or may not be seen\nbefore Conn.Ready,\ndepending on platform"];
+
+  app -> fuse [label="fs.Serve"];
+  fuse => kernel [label="read /dev/fuse fd", note="starts with InitRequest"];
+  fuse => app [label="FS/Node/Handle methods"];
+  fuse => kernel [label="write /dev/fuse fd"];
+  ... repeat ...
+
+  ... shutting down ...
+  app -> fuse [label="Unmount"];
+  fuse -> fusermount [label="fusermount -u"];
+  fusermount -> kernel;
+  kernel <<-- mounts;
+  fusermount <-- kernel;
+  fuse <<-- fusermount [diagonal];
+  app <-- fuse [label="Unmount returns"];
+
+  // actually triggers before above
+  fuse <<-- kernel [diagonal, label="/dev/fuse EOF"];
+  app <-- fuse [label="fs.Serve returns"];
+
+  app -> fuse [label="conn.Close"];
+  fuse -> kernel  [label="close /dev/fuse fd"];
+  fuse <-- kernel;
+  app <-- fuse;
+}

Godeps/_workspace/src/bazil.org/fuse/doc/mount-osx-error-init.seq

@@ -0,0 +1,32 @@
+seqdiag {
+  app;
+  fuse [label="bazil.org/fuse"];
+  wait [label="callMount\nhelper goroutine"];
+  mount_osxfusefs;
+  kernel;
+
+  app -> fuse [label="Mount"];
+  fuse -> kernel [label="open /dev/osxfuseN"];
+  fuse -> mount_osxfusefs [label="spawn, pass fd"];
+  fuse -> wait [label="goroutine", note="blocks on cmd.Wait"];
+  app <-- fuse [label="Mount returns"];
+
+  mount_osxfusefs -> kernel [label="mount(2)"];
+
+  app -> fuse [label="fs.Serve"];
+  fuse => kernel [label="read /dev/osxfuseN fd", note="starts with InitRequest,\nalso seen before mount exits:\ntwo StatfsRequest calls"];
+  fuse -> app [label="Init"];
+  fuse <-- app [color=red];
+  fuse -> kernel [label="write /dev/osxfuseN fd", color=red];
+  fuse <-- kernel;
+
+  mount_osxfusefs <-- kernel [label="mount(2) returns", color=red];
+  wait <<-- mount_osxfusefs [diagonal, label="exit", color=red];
+  app <<-- wait [diagonal, label="mount has failed,\nclose Conn.Ready", color=red];
+
+  // actually triggers before above
+  fuse <<-- kernel [diagonal, label="/dev/osxfuseN EOF"];
+  app <-- fuse [label="fs.Serve returns"];
+  ... conn.MountError != nil, so it was was never mounted ...
+  ... call conn.Close to clean up ...
+}

Godeps/_workspace/src/bazil.org/fuse/doc/mount-osx.seq

@@ -0,0 +1,45 @@
+seqdiag {
+  // seqdiag -T svg -o doc/mount-osx.svg doc/mount-osx.seq
+  app;
+  fuse [label="bazil.org/fuse"];
+  wait [label="callMount\nhelper goroutine"];
+  mount_osxfusefs;
+  kernel;
+  mounts;
+
+  app -> fuse [label="Mount"];
+  fuse -> kernel [label="open /dev/osxfuseN"];
+  fuse -> mount_osxfusefs [label="spawn, pass fd"];
+  fuse -> wait [label="goroutine", note="blocks on cmd.Wait"];
+  app <-- fuse [label="Mount returns"];
+
+  mount_osxfusefs -> kernel [label="mount(2)"];
+
+  app -> fuse [label="fs.Serve"];
+  fuse => kernel [label="read /dev/osxfuseN fd", note="starts with InitRequest,\nalso seen before mount exits:\ntwo StatfsRequest calls"];
+  fuse => app [label="FS/Node/Handle methods"];
+  fuse => kernel [label="write /dev/osxfuseN fd"];
+  ... repeat ...
+
+  kernel ->> mounts [label="mount is visible"];
+  mount_osxfusefs <-- kernel [label="mount(2) returns"];
+  wait <<-- mount_osxfusefs [diagonal, label="exit", leftnote="on OS X, successful exit\nhere means we finally know\nthe mount has happened\n(can't trust InitRequest,\nkernel might have timed out\nwaiting for InitResponse)"];
+
+  app <<-- wait [diagonal, label="mount is ready,\nclose Conn.Ready", rightnote="InitRequest and StatfsRequest\nmay or may not be seen\nbefore Conn.Ready,\ndepending on platform"];
+
+  ... shutting down ...
+  app -> fuse [label="Unmount"];
+  fuse -> kernel [label="umount(2)"];
+  kernel <<-- mounts;
+  fuse <-- kernel;
+  app <-- fuse [label="Unmount returns"];
+
+  // actually triggers before above
+  fuse <<-- kernel [diagonal, label="/dev/osxfuseN EOF"];
+  app <-- fuse [label="fs.Serve returns"];
+
+  app -> fuse [label="conn.Close"];
+  fuse -> kernel [label="close /dev/osxfuseN"];
+  fuse <-- kernel;
+  app <-- fuse;
+}

Godeps/_workspace/src/bazil.org/fuse/doc/mount-sequence.md

@@ -0,0 +1,30 @@
+# The mount sequence
+
+FUSE mounting is a little bit tricky. There's a userspace helper tool
+that performs the handshake with the kernel, and then steps out of the
+way. This helper behaves differently on different platforms, forcing a
+more complex API on us.
+
+## Successful runs
+
+On Linux, the mount is immediate and file system accesses wait until
+the requests are served.
+
+![Diagram of Linux FUSE mount sequence](mount-linux.seq.png)
+
+On OS X, the mount becomes visible only after `InitRequest` (and maybe
+more) have been served.
+
+![Diagram of OSXFUSE mount sequence](mount-osx.seq.png)
+
+
+## Errors
+
+Let's see what happens if `InitRequest` gets an error response. On
+Linux, the mountpoint is there but all operations will fail:
+
+![Diagram of Linux error handling](mount-linux-error-init.seq.png)
+
+On OS X, the mount never happened:
+
+![Diagram of OS X error handling](mount-osx-error-init.seq.png)

Godeps/_workspace/src/bazil.org/fuse/doc/writing-docs.md

@@ -0,0 +1,16 @@
+# Writing documentation
+
+## Sequence diagrams
+
+The sequence diagrams are generated with `seqdiag`:
+http://blockdiag.com/en/seqdiag/index.html
+
+An easy way to work on them is to automatically update the generated
+files with https://github.com/cespare/reflex :
+
+    reflex -g 'doc/[^.]*.seq' -- seqdiag -T svg -o '{}.svg' '{}' &
+
+    reflex -g 'doc/[^.]*.seq' -- seqdiag -T png -o '{}.png' '{}' &
+
+The markdown files refer to PNG images because of Github limitations,
+but the SVG is generally more pleasant to view.

Godeps/_workspace/src/bazil.org/fuse/examples/clockfs/clockfs.go

@@ -0,0 +1,173 @@
+// Clockfs implements a file system with the current time in a file.
+// It was written to demonstrate kernel cache invalidation.
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"os"
+	"sync/atomic"
+	"syscall"
+	"time"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	_ "bazil.org/fuse/fs/fstestutil"
+	"bazil.org/fuse/fuseutil"
+	"golang.org/x/net/context"
+)
+
+func usage() {
+	fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
+	fmt.Fprintf(os.Stderr, "  %s MOUNTPOINT\n", os.Args[0])
+	flag.PrintDefaults()
+}
+
+func main() {
+	flag.Usage = usage
+	flag.Parse()
+
+	if flag.NArg() != 1 {
+		usage()
+		os.Exit(2)
+	}
+	mountpoint := flag.Arg(0)
+
+	c, err := fuse.Mount(
+		mountpoint,
+		fuse.FSName("clock"),
+		fuse.Subtype("clockfsfs"),
+		fuse.LocalVolume(),
+		fuse.VolumeName("Clock filesystem"),
+	)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer c.Close()
+
+	srv := fs.New(c, nil)
+	filesys := &FS{
+		// We pre-create the clock node so that it's always the same
+		// object returned from all the Lookups. You could carefully
+		// track its lifetime between Lookup&Forget, and have the
+		// ticking & invalidation happen only when active, but let's
+		// keep this example simple.
+		clockFile: &File{
+			fuse: srv,
+		},
+	}
+	filesys.clockFile.tick()
+	// This goroutine never exits. That's fine for this example.
+	go filesys.clockFile.update()
+	if err := srv.Serve(filesys); err != nil {
+		log.Fatal(err)
+	}
+
+	// Check if the mount process has an error to report.
+	<-c.Ready
+	if err := c.MountError; err != nil {
+		log.Fatal(err)
+	}
+}
+
+type FS struct {
+	clockFile *File
+}
+
+var _ fs.FS = (*FS)(nil)
+
+func (f *FS) Root() (fs.Node, error) {
+	return &Dir{fs: f}, nil
+}
+
+// Dir implements both Node and Handle for the root directory.
+type Dir struct {
+	fs *FS
+}
+
+var _ fs.Node = (*Dir)(nil)
+
+func (d *Dir) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Inode = 1
+	a.Mode = os.ModeDir | 0555
+	return nil
+}
+
+var _ fs.NodeStringLookuper = (*Dir)(nil)
+
+func (d *Dir) Lookup(ctx context.Context, name string) (fs.Node, error) {
+	if name == "clock" {
+		return d.fs.clockFile, nil
+	}
+	return nil, fuse.ENOENT
+}
+
+var dirDirs = []fuse.Dirent{
+	{Inode: 2, Name: "clock", Type: fuse.DT_File},
+}
+
+var _ fs.HandleReadDirAller = (*Dir)(nil)
+
+func (d *Dir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
+	return dirDirs, nil
+}
+
+type File struct {
+	fs.NodeRef
+	fuse    *fs.Server
+	content atomic.Value
+	count   uint64
+}
+
+var _ fs.Node = (*File)(nil)
+
+func (f *File) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Inode = 2
+	a.Mode = 0444
+	t := f.content.Load().(string)
+	a.Size = uint64(len(t))
+	return nil
+}
+
+var _ fs.NodeOpener = (*File)(nil)
+
+func (f *File) Open(ctx context.Context, req *fuse.OpenRequest, resp *fuse.OpenResponse) (fs.Handle, error) {
+	if !req.Flags.IsReadOnly() {
+		return nil, fuse.Errno(syscall.EACCES)
+	}
+	resp.Flags |= fuse.OpenKeepCache
+	return f, nil
+}
+
+var _ fs.Handle = (*File)(nil)
+
+var _ fs.HandleReader = (*File)(nil)
+
+func (f *File) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadResponse) error {
+	t := f.content.Load().(string)
+	fuseutil.HandleRead(req, resp, []byte(t))
+	return nil
+}
+
+func (f *File) tick() {
+	// Intentionally a variable-length format, to demonstrate size changes.
+	f.count++
+	s := fmt.Sprintf("%d\t%s\n", f.count, time.Now())
+	f.content.Store(s)
+
+	// For simplicity, this example tries to send invalidate
+	// notifications even when the kernel does not hold a reference to
+	// the node, so be extra sure to ignore ErrNotCached.
+	if err := f.fuse.InvalidateNodeData(f); err != nil && err != fuse.ErrNotCached {
+		log.Printf("invalidate error: %v", err)
+	}
+}
+
+func (f *File) update() {
+	tick := time.NewTicker(1 * time.Second)
+	defer tick.Stop()
+	for range tick.C {
+		f.tick()
+	}
+}

Godeps/_workspace/src/bazil.org/fuse/examples/hellofs/hello.go

@@ -0,0 +1,101 @@
+// Hellofs implements a simple "hello world" file system.
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"os"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	_ "bazil.org/fuse/fs/fstestutil"
+	"golang.org/x/net/context"
+)
+
+var Usage = func() {
+	fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
+	fmt.Fprintf(os.Stderr, "  %s MOUNTPOINT\n", os.Args[0])
+	flag.PrintDefaults()
+}
+
+func main() {
+	flag.Usage = Usage
+	flag.Parse()
+
+	if flag.NArg() != 1 {
+		Usage()
+		os.Exit(2)
+	}
+	mountpoint := flag.Arg(0)
+
+	c, err := fuse.Mount(
+		mountpoint,
+		fuse.FSName("helloworld"),
+		fuse.Subtype("hellofs"),
+		fuse.LocalVolume(),
+		fuse.VolumeName("Hello world!"),
+	)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer c.Close()
+
+	err = fs.Serve(c, FS{})
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// check if the mount process has an error to report
+	<-c.Ready
+	if err := c.MountError; err != nil {
+		log.Fatal(err)
+	}
+}
+
+// FS implements the hello world file system.
+type FS struct{}
+
+func (FS) Root() (fs.Node, error) {
+	return Dir{}, nil
+}
+
+// Dir implements both Node and Handle for the root directory.
+type Dir struct{}
+
+func (Dir) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Inode = 1
+	a.Mode = os.ModeDir | 0555
+	return nil
+}
+
+func (Dir) Lookup(ctx context.Context, name string) (fs.Node, error) {
+	if name == "hello" {
+		return File{}, nil
+	}
+	return nil, fuse.ENOENT
+}
+
+var dirDirs = []fuse.Dirent{
+	{Inode: 2, Name: "hello", Type: fuse.DT_File},
+}
+
+func (Dir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
+	return dirDirs, nil
+}
+
+// File implements both Node and Handle for the hello file.
+type File struct{}
+
+const greeting = "hello, world\n"
+
+func (File) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Inode = 2
+	a.Mode = 0444
+	a.Size = uint64(len(greeting))
+	return nil
+}
+
+func (File) ReadAll(ctx context.Context) ([]byte, error) {
+	return []byte(greeting), nil
+}

Godeps/_workspace/src/bazil.org/fuse/fs/bench/bench_test.go

@@ -0,0 +1,268 @@
+package bench_test
+
+import (
+	"io"
+	"io/ioutil"
+	"os"
+	"path"
+	"testing"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	"bazil.org/fuse/fs/fstestutil"
+	"golang.org/x/net/context"
+)
+
+type benchConfig struct {
+	directIO bool
+}
+
+type benchFS struct {
+	conf *benchConfig
+}
+
+var _ = fs.FS(benchFS{})
+
+func (f benchFS) Root() (fs.Node, error) {
+	return benchDir{conf: f.conf}, nil
+}
+
+type benchDir struct {
+	conf *benchConfig
+}
+
+var _ = fs.Node(benchDir{})
+var _ = fs.NodeStringLookuper(benchDir{})
+var _ = fs.Handle(benchDir{})
+var _ = fs.HandleReadDirAller(benchDir{})
+
+func (benchDir) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Inode = 1
+	a.Mode = os.ModeDir | 0555
+	return nil
+}
+
+func (d benchDir) Lookup(ctx context.Context, name string) (fs.Node, error) {
+	if name == "bench" {
+		return benchFile{conf: d.conf}, nil
+	}
+	return nil, fuse.ENOENT
+}
+
+func (benchDir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
+	l := []fuse.Dirent{
+		{Inode: 2, Name: "bench", Type: fuse.DT_File},
+	}
+	return l, nil
+}
+
+type benchFile struct {
+	conf *benchConfig
+}
+
+var _ = fs.Node(benchFile{})
+var _ = fs.NodeOpener(benchFile{})
+var _ = fs.NodeFsyncer(benchFile{})
+var _ = fs.Handle(benchFile{})
+var _ = fs.HandleReader(benchFile{})
+var _ = fs.HandleWriter(benchFile{})
+
+func (benchFile) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Inode = 2
+	a.Mode = 0644
+	a.Size = 9999999999999999
+	return nil
+}
+
+func (f benchFile) Open(ctx context.Context, req *fuse.OpenRequest, resp *fuse.OpenResponse) (fs.Handle, error) {
+	if f.conf.directIO {
+		resp.Flags |= fuse.OpenDirectIO
+	}
+	// TODO configurable?
+	resp.Flags |= fuse.OpenKeepCache
+	return f, nil
+}
+
+func (benchFile) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadResponse) error {
+	resp.Data = resp.Data[:cap(resp.Data)]
+	return nil
+}
+
+func (benchFile) Write(ctx context.Context, req *fuse.WriteRequest, resp *fuse.WriteResponse) error {
+	resp.Size = len(req.Data)
+	return nil
+}
+
+func (benchFile) Fsync(ctx context.Context, req *fuse.FsyncRequest) error {
+	return nil
+}
+
+func benchmark(b *testing.B, fn func(b *testing.B, mnt string), conf *benchConfig) {
+	filesys := benchFS{
+		conf: conf,
+	}
+	mnt, err := fstestutil.Mounted(filesys, nil,
+		fuse.MaxReadahead(64*1024*1024),
+		fuse.AsyncRead(),
+		fuse.WritebackCache(),
+	)
+	if err != nil {
+		b.Fatal(err)
+	}
+	defer mnt.Close()
+
+	fn(b, mnt.Dir)
+}
+
+type zero struct{}
+
+func (zero) Read(p []byte) (n int, err error) {
+	return len(p), nil
+}
+
+var Zero io.Reader = zero{}
+
+func doWrites(size int64) func(b *testing.B, mnt string) {
+	return func(b *testing.B, mnt string) {
+		p := path.Join(mnt, "bench")
+
+		f, err := os.Create(p)
+		if err != nil {
+			b.Fatalf("create: %v", err)
+		}
+		defer f.Close()
+
+		b.ResetTimer()
+		b.SetBytes(size)
+
+		for i := 0; i < b.N; i++ {
+			_, err = io.CopyN(f, Zero, size)
+			if err != nil {
+				b.Fatalf("write: %v", err)
+			}
+		}
+	}
+}
+
+func BenchmarkWrite100(b *testing.B) {
+	benchmark(b, doWrites(100), &benchConfig{})
+}
+
+func BenchmarkWrite10MB(b *testing.B) {
+	benchmark(b, doWrites(10*1024*1024), &benchConfig{})
+}
+
+func BenchmarkWrite100MB(b *testing.B) {
+	benchmark(b, doWrites(100*1024*1024), &benchConfig{})
+}
+
+func BenchmarkDirectWrite100(b *testing.B) {
+	benchmark(b, doWrites(100), &benchConfig{
+		directIO: true,
+	})
+}
+
+func BenchmarkDirectWrite10MB(b *testing.B) {
+	benchmark(b, doWrites(10*1024*1024), &benchConfig{
+		directIO: true,
+	})
+}
+
+func BenchmarkDirectWrite100MB(b *testing.B) {
+	benchmark(b, doWrites(100*1024*1024), &benchConfig{
+		directIO: true,
+	})
+}
+
+func doWritesSync(size int64) func(b *testing.B, mnt string) {
+	return func(b *testing.B, mnt string) {
+		p := path.Join(mnt, "bench")
+
+		f, err := os.Create(p)
+		if err != nil {
+			b.Fatalf("create: %v", err)
+		}
+		defer f.Close()
+
+		b.ResetTimer()
+		b.SetBytes(size)
+
+		for i := 0; i < b.N; i++ {
+			_, err = io.CopyN(f, Zero, size)
+			if err != nil {
+				b.Fatalf("write: %v", err)
+			}
+
+			if err := f.Sync(); err != nil {
+				b.Fatalf("sync: %v", err)
+			}
+		}
+	}
+}
+
+func BenchmarkWriteSync100(b *testing.B) {
+	benchmark(b, doWritesSync(100), &benchConfig{})
+}
+
+func BenchmarkWriteSync10MB(b *testing.B) {
+	benchmark(b, doWritesSync(10*1024*1024), &benchConfig{})
+}
+
+func BenchmarkWriteSync100MB(b *testing.B) {
+	benchmark(b, doWritesSync(100*1024*1024), &benchConfig{})
+}
+
+func doReads(size int64) func(b *testing.B, mnt string) {
+	return func(b *testing.B, mnt string) {
+		p := path.Join(mnt, "bench")
+
+		f, err := os.Open(p)
+		if err != nil {
+			b.Fatalf("close: %v", err)
+		}
+		defer f.Close()
+
+		b.ResetTimer()
+		b.SetBytes(size)
+
+		for i := 0; i < b.N; i++ {
+			n, err := io.CopyN(ioutil.Discard, f, size)
+			if err != nil {
+				b.Fatalf("read: %v", err)
+			}
+			if n != size {
+				b.Errorf("unexpected size: %d != %d", n, size)
+			}
+		}
+	}
+}
+
+func BenchmarkRead100(b *testing.B) {
+	benchmark(b, doReads(100), &benchConfig{})
+}
+
+func BenchmarkRead10MB(b *testing.B) {
+	benchmark(b, doReads(10*1024*1024), &benchConfig{})
+}
+
+func BenchmarkRead100MB(b *testing.B) {
+	benchmark(b, doReads(100*1024*1024), &benchConfig{})
+}
+
+func BenchmarkDirectRead100(b *testing.B) {
+	benchmark(b, doReads(100), &benchConfig{
+		directIO: true,
+	})
+}
+
+func BenchmarkDirectRead10MB(b *testing.B) {
+	benchmark(b, doReads(10*1024*1024), &benchConfig{
+		directIO: true,
+	})
+}
+
+func BenchmarkDirectRead100MB(b *testing.B) {
+	benchmark(b, doReads(100*1024*1024), &benchConfig{
+		directIO: true,
+	})
+}

Godeps/_workspace/src/bazil.org/fuse/fs/bench/doc.go

@@ -0,0 +1,5 @@
+// Package bench contains benchmarks.
+//
+// It is kept in a separate package to avoid conflicting with the
+// debug-heavy defaults for the actual tests.
+package bench

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/debug.go

@@ -0,0 +1,65 @@
+package fstestutil
+
+import (
+	"flag"
+	"log"
+	"strconv"
+
+	"bazil.org/fuse"
+)
+
+type flagDebug bool
+
+var debug flagDebug
+
+var _ = flag.Value(&debug)
+
+func (f *flagDebug) IsBoolFlag() bool {
+	return true
+}
+
+func nop(msg interface{}) {}
+
+func (f *flagDebug) Set(s string) error {
+	v, err := strconv.ParseBool(s)
+	if err != nil {
+		return err
+	}
+	*f = flagDebug(v)
+	if v {
+		fuse.Debug = logMsg
+	} else {
+		fuse.Debug = nop
+	}
+	return nil
+}
+
+func (f *flagDebug) String() string {
+	return strconv.FormatBool(bool(*f))
+}
+
+func logMsg(msg interface{}) {
+	log.Printf("FUSE: %s\n", msg)
+}
+
+func init() {
+	flag.Var(&debug, "fuse.debug", "log FUSE processing details")
+}
+
+// DebugByDefault changes the default of the `-fuse.debug` flag to
+// true.
+//
+// This package registers a command line flag `-fuse.debug` and when
+// run with that flag (and activated inside the tests), logs FUSE
+// debug messages.
+//
+// This is disabled by default, as most callers probably won't care
+// about FUSE details. Use DebugByDefault for tests where you'd
+// normally be passing `-fuse.debug` all the time anyway.
+//
+// Call from an init function.
+func DebugByDefault() {
+	f := flag.Lookup("fuse.debug")
+	f.DefValue = "true"
+	f.Value.Set(f.DefValue)
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/doc.go

@@ -0,0 +1 @@
+package fstestutil

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mounted.go

@@ -0,0 +1,115 @@
+package fstestutil
+
+import (
+	"errors"
+	"io/ioutil"
+	"log"
+	"os"
+	"testing"
+	"time"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+)
+
+// Mount contains information about the mount for the test to use.
+type Mount struct {
+	// Dir is the temporary directory where the filesystem is mounted.
+	Dir string
+
+	Conn   *fuse.Conn
+	Server *fs.Server
+
+	// Error will receive the return value of Serve.
+	Error <-chan error
+
+	done   <-chan struct{}
+	closed bool
+}
+
+// Close unmounts the filesystem and waits for fs.Serve to return. Any
+// returned error will be stored in Err. It is safe to call Close
+// multiple times.
+func (mnt *Mount) Close() {
+	if mnt.closed {
+		return
+	}
+	mnt.closed = true
+	for tries := 0; tries < 1000; tries++ {
+		err := fuse.Unmount(mnt.Dir)
+		if err != nil {
+			// TODO do more than log?
+			log.Printf("unmount error: %v", err)
+			time.Sleep(10 * time.Millisecond)
+			continue
+		}
+		break
+	}
+	<-mnt.done
+	mnt.Conn.Close()
+	os.Remove(mnt.Dir)
+}
+
+// Mounted mounts the fuse.Server at a temporary directory.
+//
+// It also waits until the filesystem is known to be visible (OS X
+// workaround).
+//
+// After successful return, caller must clean up by calling Close.
+func Mounted(filesys fs.FS, conf *fs.Config, options ...fuse.MountOption) (*Mount, error) {
+	dir, err := ioutil.TempDir("", "fusetest")
+	if err != nil {
+		return nil, err
+	}
+	c, err := fuse.Mount(dir, options...)
+	if err != nil {
+		return nil, err
+	}
+	server := fs.New(c, conf)
+	done := make(chan struct{})
+	serveErr := make(chan error, 1)
+	mnt := &Mount{
+		Dir:    dir,
+		Conn:   c,
+		Server: server,
+		Error:  serveErr,
+		done:   done,
+	}
+	go func() {
+		defer close(done)
+		serveErr <- server.Serve(filesys)
+	}()
+
+	select {
+	case <-mnt.Conn.Ready:
+		if err := mnt.Conn.MountError; err != nil {
+			return nil, err
+		}
+		return mnt, nil
+	case err = <-mnt.Error:
+		// Serve quit early
+		if err != nil {
+			return nil, err
+		}
+		return nil, errors.New("Serve exited early")
+	}
+}
+
+// MountedT mounts the filesystem at a temporary directory,
+// directing it's debug log to the testing logger.
+//
+// See Mounted for usage.
+//
+// The debug log is not enabled by default. Use `-fuse.debug` or call
+// DebugByDefault to enable.
+func MountedT(t testing.TB, filesys fs.FS, conf *fs.Config, options ...fuse.MountOption) (*Mount, error) {
+	if conf == nil {
+		conf = &fs.Config{}
+	}
+	if debug && conf.Debug == nil {
+		conf.Debug = func(msg interface{}) {
+			t.Logf("FUSE: %s", msg)
+		}
+	}
+	return Mounted(filesys, conf, options...)
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo.go

@@ -0,0 +1,26 @@
+package fstestutil
+
+// MountInfo describes a mounted file system.
+type MountInfo struct {
+	FSName string
+	Type   string
+}
+
+// GetMountInfo finds information about the mount at mnt. It is
+// intended for use by tests only, and only fetches information
+// relevant to the current tests.
+func GetMountInfo(mnt string) (*MountInfo, error) {
+	return getMountInfo(mnt)
+}
+
+// cstr converts a nil-terminated C string into a Go string
+func cstr(ca []int8) string {
+	s := make([]byte, 0, len(ca))
+	for _, c := range ca {
+		if c == 0x00 {
+			break
+		}
+		s = append(s, byte(c))
+	}
+	return string(s)
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo_darwin.go

@@ -0,0 +1,29 @@
+package fstestutil
+
+import (
+	"regexp"
+	"syscall"
+)
+
+var re = regexp.MustCompile(`\\(.)`)
+
+// unescape removes backslash-escaping. The escaped characters are not
+// mapped in any way; that is, unescape(`\n` ) == `n`.
+func unescape(s string) string {
+	return re.ReplaceAllString(s, `$1`)
+}
+
+func getMountInfo(mnt string) (*MountInfo, error) {
+	var st syscall.Statfs_t
+	err := syscall.Statfs(mnt, &st)
+	if err != nil {
+		return nil, err
+	}
+	i := &MountInfo{
+		// osx getmntent(3) fails to un-escape the data, so we do it..
+		// this might lead to double-unescaping in the future. fun.
+		// TestMountOptionFSNameEvilBackslashDouble checks for that.
+		FSName: unescape(cstr(st.Mntfromname[:])),
+	}
+	return i, nil
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo_freebsd.go

@@ -0,0 +1,7 @@
+package fstestutil
+
+import "errors"
+
+func getMountInfo(mnt string) (*MountInfo, error) {
+	return nil, errors.New("FreeBSD has no useful mount information")
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/mountinfo_linux.go

@@ -0,0 +1,51 @@
+package fstestutil
+
+import (
+	"errors"
+	"io/ioutil"
+	"strings"
+)
+
+// Linux /proc/mounts shows current mounts.
+// Same format as /etc/fstab. Quoting getmntent(3):
+//
+// Since fields in the mtab and fstab files are separated by whitespace,
+// octal escapes are used to represent the four characters space (\040),
+// tab (\011), newline (\012) and backslash (\134) in those files when
+// they occur in one of the four strings in a mntent structure.
+//
+// http://linux.die.net/man/3/getmntent
+
+var fstabUnescape = strings.NewReplacer(
+	`\040`, "\040",
+	`\011`, "\011",
+	`\012`, "\012",
+	`\134`, "\134",
+)
+
+var errNotFound = errors.New("mount not found")
+
+func getMountInfo(mnt string) (*MountInfo, error) {
+	data, err := ioutil.ReadFile("/proc/mounts")
+	if err != nil {
+		return nil, err
+	}
+	for _, line := range strings.Split(string(data), "\n") {
+		fields := strings.Fields(line)
+		if len(fields) < 3 {
+			continue
+		}
+		// Fields are: fsname dir type opts freq passno
+		fsname := fstabUnescape.Replace(fields[0])
+		dir := fstabUnescape.Replace(fields[1])
+		fstype := fstabUnescape.Replace(fields[2])
+		if mnt == dir {
+			info := &MountInfo{
+				FSName: fsname,
+				Type:   fstype,
+			}
+			return info, nil
+		}
+	}
+	return nil, errNotFound
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/buffer.go

@@ -0,0 +1,28 @@
+package record
+
+import (
+	"bytes"
+	"io"
+	"sync"
+)
+
+// Buffer is like bytes.Buffer but safe to access from multiple
+// goroutines.
+type Buffer struct {
+	mu  sync.Mutex
+	buf bytes.Buffer
+}
+
+var _ = io.Writer(&Buffer{})
+
+func (b *Buffer) Write(p []byte) (n int, err error) {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+	return b.buf.Write(p)
+}
+
+func (b *Buffer) Bytes() []byte {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+	return b.buf.Bytes()
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/record.go

@@ -0,0 +1,384 @@
+package record
+
+import (
+	"sync"
+	"sync/atomic"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	"golang.org/x/net/context"
+)
+
+// Writes gathers data from FUSE Write calls.
+type Writes struct {
+	buf Buffer
+}
+
+var _ = fs.HandleWriter(&Writes{})
+
+func (w *Writes) Write(ctx context.Context, req *fuse.WriteRequest, resp *fuse.WriteResponse) error {
+	n, err := w.buf.Write(req.Data)
+	resp.Size = n
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (w *Writes) RecordedWriteData() []byte {
+	return w.buf.Bytes()
+}
+
+// Counter records number of times a thing has occurred.
+type Counter struct {
+	count uint32
+}
+
+func (r *Counter) Inc() {
+	atomic.AddUint32(&r.count, 1)
+}
+
+func (r *Counter) Count() uint32 {
+	return atomic.LoadUint32(&r.count)
+}
+
+// MarkRecorder records whether a thing has occurred.
+type MarkRecorder struct {
+	count Counter
+}
+
+func (r *MarkRecorder) Mark() {
+	r.count.Inc()
+}
+
+func (r *MarkRecorder) Recorded() bool {
+	return r.count.Count() > 0
+}
+
+// Flushes notes whether a FUSE Flush call has been seen.
+type Flushes struct {
+	rec MarkRecorder
+}
+
+var _ = fs.HandleFlusher(&Flushes{})
+
+func (r *Flushes) Flush(ctx context.Context, req *fuse.FlushRequest) error {
+	r.rec.Mark()
+	return nil
+}
+
+func (r *Flushes) RecordedFlush() bool {
+	return r.rec.Recorded()
+}
+
+type Recorder struct {
+	mu  sync.Mutex
+	val interface{}
+}
+
+// Record that we've seen value. A nil value is indistinguishable from
+// no value recorded.
+func (r *Recorder) Record(value interface{}) {
+	r.mu.Lock()
+	r.val = value
+	r.mu.Unlock()
+}
+
+func (r *Recorder) Recorded() interface{} {
+	r.mu.Lock()
+	val := r.val
+	r.mu.Unlock()
+	return val
+}
+
+type RequestRecorder struct {
+	rec Recorder
+}
+
+// Record a fuse.Request, after zeroing header fields that are hard to
+// reproduce.
+//
+// Make sure to record a copy, not the original request.
+func (r *RequestRecorder) RecordRequest(req fuse.Request) {
+	hdr := req.Hdr()
+	*hdr = fuse.Header{}
+	r.rec.Record(req)
+}
+
+func (r *RequestRecorder) Recorded() fuse.Request {
+	val := r.rec.Recorded()
+	if val == nil {
+		return nil
+	}
+	return val.(fuse.Request)
+}
+
+// Setattrs records a Setattr request and its fields.
+type Setattrs struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeSetattrer(&Setattrs{})
+
+func (r *Setattrs) Setattr(ctx context.Context, req *fuse.SetattrRequest, resp *fuse.SetattrResponse) error {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil
+}
+
+func (r *Setattrs) RecordedSetattr() fuse.SetattrRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.SetattrRequest{}
+	}
+	return *(val.(*fuse.SetattrRequest))
+}
+
+// Fsyncs records an Fsync request and its fields.
+type Fsyncs struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeFsyncer(&Fsyncs{})
+
+func (r *Fsyncs) Fsync(ctx context.Context, req *fuse.FsyncRequest) error {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil
+}
+
+func (r *Fsyncs) RecordedFsync() fuse.FsyncRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.FsyncRequest{}
+	}
+	return *(val.(*fuse.FsyncRequest))
+}
+
+// Mkdirs records a Mkdir request and its fields.
+type Mkdirs struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeMkdirer(&Mkdirs{})
+
+// Mkdir records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Mkdirs) Mkdir(ctx context.Context, req *fuse.MkdirRequest) (fs.Node, error) {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil, fuse.EIO
+}
+
+// RecordedMkdir returns information about the Mkdir request.
+// If no request was seen, returns a zero value.
+func (r *Mkdirs) RecordedMkdir() fuse.MkdirRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.MkdirRequest{}
+	}
+	return *(val.(*fuse.MkdirRequest))
+}
+
+// Symlinks records a Symlink request and its fields.
+type Symlinks struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeSymlinker(&Symlinks{})
+
+// Symlink records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Symlinks) Symlink(ctx context.Context, req *fuse.SymlinkRequest) (fs.Node, error) {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil, fuse.EIO
+}
+
+// RecordedSymlink returns information about the Symlink request.
+// If no request was seen, returns a zero value.
+func (r *Symlinks) RecordedSymlink() fuse.SymlinkRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.SymlinkRequest{}
+	}
+	return *(val.(*fuse.SymlinkRequest))
+}
+
+// Links records a Link request and its fields.
+type Links struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeLinker(&Links{})
+
+// Link records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Links) Link(ctx context.Context, req *fuse.LinkRequest, old fs.Node) (fs.Node, error) {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil, fuse.EIO
+}
+
+// RecordedLink returns information about the Link request.
+// If no request was seen, returns a zero value.
+func (r *Links) RecordedLink() fuse.LinkRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.LinkRequest{}
+	}
+	return *(val.(*fuse.LinkRequest))
+}
+
+// Mknods records a Mknod request and its fields.
+type Mknods struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeMknoder(&Mknods{})
+
+// Mknod records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Mknods) Mknod(ctx context.Context, req *fuse.MknodRequest) (fs.Node, error) {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil, fuse.EIO
+}
+
+// RecordedMknod returns information about the Mknod request.
+// If no request was seen, returns a zero value.
+func (r *Mknods) RecordedMknod() fuse.MknodRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.MknodRequest{}
+	}
+	return *(val.(*fuse.MknodRequest))
+}
+
+// Opens records a Open request and its fields.
+type Opens struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeOpener(&Opens{})
+
+// Open records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Opens) Open(ctx context.Context, req *fuse.OpenRequest, resp *fuse.OpenResponse) (fs.Handle, error) {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil, fuse.EIO
+}
+
+// RecordedOpen returns information about the Open request.
+// If no request was seen, returns a zero value.
+func (r *Opens) RecordedOpen() fuse.OpenRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.OpenRequest{}
+	}
+	return *(val.(*fuse.OpenRequest))
+}
+
+// Getxattrs records a Getxattr request and its fields.
+type Getxattrs struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeGetxattrer(&Getxattrs{})
+
+// Getxattr records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Getxattrs) Getxattr(ctx context.Context, req *fuse.GetxattrRequest, resp *fuse.GetxattrResponse) error {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return fuse.ErrNoXattr
+}
+
+// RecordedGetxattr returns information about the Getxattr request.
+// If no request was seen, returns a zero value.
+func (r *Getxattrs) RecordedGetxattr() fuse.GetxattrRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.GetxattrRequest{}
+	}
+	return *(val.(*fuse.GetxattrRequest))
+}
+
+// Listxattrs records a Listxattr request and its fields.
+type Listxattrs struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeListxattrer(&Listxattrs{})
+
+// Listxattr records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Listxattrs) Listxattr(ctx context.Context, req *fuse.ListxattrRequest, resp *fuse.ListxattrResponse) error {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return fuse.ErrNoXattr
+}
+
+// RecordedListxattr returns information about the Listxattr request.
+// If no request was seen, returns a zero value.
+func (r *Listxattrs) RecordedListxattr() fuse.ListxattrRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.ListxattrRequest{}
+	}
+	return *(val.(*fuse.ListxattrRequest))
+}
+
+// Setxattrs records a Setxattr request and its fields.
+type Setxattrs struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeSetxattrer(&Setxattrs{})
+
+// Setxattr records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Setxattrs) Setxattr(ctx context.Context, req *fuse.SetxattrRequest) error {
+	tmp := *req
+	// The byte slice points to memory that will be reused, so make a
+	// deep copy.
+	tmp.Xattr = append([]byte(nil), req.Xattr...)
+	r.rec.RecordRequest(&tmp)
+	return nil
+}
+
+// RecordedSetxattr returns information about the Setxattr request.
+// If no request was seen, returns a zero value.
+func (r *Setxattrs) RecordedSetxattr() fuse.SetxattrRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.SetxattrRequest{}
+	}
+	return *(val.(*fuse.SetxattrRequest))
+}
+
+// Removexattrs records a Removexattr request and its fields.
+type Removexattrs struct {
+	rec RequestRecorder
+}
+
+var _ = fs.NodeRemovexattrer(&Removexattrs{})
+
+// Removexattr records the request and returns an error. Most callers should
+// wrap this call in a function that returns a more useful result.
+func (r *Removexattrs) Removexattr(ctx context.Context, req *fuse.RemovexattrRequest) error {
+	tmp := *req
+	r.rec.RecordRequest(&tmp)
+	return nil
+}
+
+// RecordedRemovexattr returns information about the Removexattr request.
+// If no request was seen, returns a zero value.
+func (r *Removexattrs) RecordedRemovexattr() fuse.RemovexattrRequest {
+	val := r.rec.Recorded()
+	if val == nil {
+		return fuse.RemovexattrRequest{}
+	}
+	return *(val.(*fuse.RemovexattrRequest))
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/wait.go

@@ -0,0 +1,55 @@
+package record
+
+import (
+	"sync"
+	"time"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	"golang.org/x/net/context"
+)
+
+type nothing struct{}
+
+// ReleaseWaiter notes whether a FUSE Release call has been seen.
+//
+// Releases are not guaranteed to happen synchronously with any client
+// call, so they must be waited for.
+type ReleaseWaiter struct {
+	once sync.Once
+	seen chan nothing
+}
+
+var _ = fs.HandleReleaser(&ReleaseWaiter{})
+
+func (r *ReleaseWaiter) init() {
+	r.once.Do(func() {
+		r.seen = make(chan nothing, 1)
+	})
+}
+
+func (r *ReleaseWaiter) Release(ctx context.Context, req *fuse.ReleaseRequest) error {
+	r.init()
+	close(r.seen)
+	return nil
+}
+
+// WaitForRelease waits for Release to be called.
+//
+// With zero duration, wait forever. Otherwise, timeout early
+// in a more controller way than `-test.timeout`.
+//
+// Returns whether a Release was seen. Always true if dur==0.
+func (r *ReleaseWaiter) WaitForRelease(dur time.Duration) bool {
+	r.init()
+	var timeout <-chan time.Time
+	if dur > 0 {
+		timeout = time.After(dur)
+	}
+	select {
+	case <-r.seen:
+		return true
+	case <-timeout:
+		return false
+	}
+}

Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/testfs.go

@@ -0,0 +1,55 @@
+package fstestutil
+
+import (
+	"os"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	"golang.org/x/net/context"
+)
+
+// SimpleFS is a trivial FS that just implements the Root method.
+type SimpleFS struct {
+	Node fs.Node
+}
+
+var _ = fs.FS(SimpleFS{})
+
+func (f SimpleFS) Root() (fs.Node, error) {
+	return f.Node, nil
+}
+
+// File can be embedded in a struct to make it look like a file.
+type File struct{}
+
+func (f File) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Mode = 0666
+	return nil
+}
+
+// Dir can be embedded in a struct to make it look like a directory.
+type Dir struct{}
+
+func (f Dir) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Mode = os.ModeDir | 0777
+	return nil
+}
+
+// ChildMap is a directory with child nodes looked up from a map.
+type ChildMap map[string]fs.Node
+
+var _ = fs.Node(&ChildMap{})
+var _ = fs.NodeStringLookuper(&ChildMap{})
+
+func (f *ChildMap) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Mode = os.ModeDir | 0777
+	return nil
+}
+
+func (f *ChildMap) Lookup(ctx context.Context, name string) (fs.Node, error) {
+	child, ok := (*f)[name]
+	if !ok {
+		return nil, fuse.ENOENT
+	}
+	return child, nil
+}

Godeps/_workspace/src/bazil.org/fuse/fs/helpers_test.go

@@ -0,0 +1,67 @@
+package fs_test
+
+import (
+	"errors"
+	"flag"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"testing"
+)
+
+var childHelpers = map[string]func(){}
+
+type childProcess struct {
+	name string
+	fn   func()
+}
+
+var _ flag.Value = (*childProcess)(nil)
+
+func (c *childProcess) String() string {
+	return c.name
+}
+
+func (c *childProcess) Set(s string) error {
+	fn, ok := childHelpers[s]
+	if !ok {
+		return errors.New("helper not found")
+	}
+	c.name = s
+	c.fn = fn
+	return nil
+}
+
+var childMode childProcess
+
+func init() {
+	flag.Var(&childMode, "fuse.internal.child", "internal use only")
+}
+
+// childCmd prepares a test function to be run in a subprocess, with
+// childMode set to true. Caller must still call Run or Start.
+//
+// Re-using the test executable as the subprocess is useful because
+// now test executables can e.g. be cross-compiled, transferred
+// between hosts, and run in settings where the whole Go development
+// environment is not installed.
+func childCmd(childName string) (*exec.Cmd, error) {
+	// caller may set cwd, so we can't rely on relative paths
+	executable, err := filepath.Abs(os.Args[0])
+	if err != nil {
+		return nil, err
+	}
+	cmd := exec.Command(executable, "-fuse.internal.child="+childName)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd, nil
+}
+
+func TestMain(m *testing.M) {
+	flag.Parse()
+	if childMode.fn != nil {
+		childMode.fn()
+		os.Exit(0)
+	}
+	os.Exit(m.Run())
+}

Godeps/_workspace/src/bazil.org/fuse/fs/serve.go

@@ -1,6 +1,6 @@
 // FUSE service loop, for servers that wish to use it.
 
-package fs // import "bazil.org/fuse/fs"
+package fs
 
 import (
 	"encoding/binary"
@@ -18,8 +18,6 @@ import (
 )
 
 import (
-	"bytes"
-
 	"bazil.org/fuse"
 	"bazil.org/fuse/fuseutil"
 )
@@ -91,13 +89,6 @@ type FSInodeGenerator interface {
 // simple, read-only filesystem.
 type Node interface {
 	// Attr fills attr with the standard metadata for the node.
-	//
-	// Fields with reasonable defaults are prepopulated. For example,
-	// all times are set to a fixed moment when the program started.
-	//
-	// If Inode is left as 0, a dynamic inode number is chosen.
-	//
-	// The result may be cached for the duration set in Valid.
 	Attr(ctx context.Context, attr *fuse.Attr) error
 }
 
@@ -114,7 +105,9 @@ type NodeSetattrer interface {
 	// Setattr sets the standard metadata for the receiver.
 	//
 	// Note, this is also used to communicate changes in the size of
-	// the file, outside of Writes.
+	// the file. Not implementing Setattr causes writes to be unable
+	// to grow the file (except with OpenDirectIO, which bypasses that
+	// mechanism).
 	//
 	// req.Valid is a bitmask of what fields are actually being set.
 	// For example, the method should not change the mode of the file
@@ -304,17 +297,16 @@ type HandleReader interface {
 }
 
 type HandleWriter interface {
-	// Write requests to write data into the handle at the given offset.
-	// Store the amount of data written in resp.Size.
+	// Write requests to write data into the handle.
 	//
 	// There is a writeback page cache in the kernel that normally submits
 	// only page-aligned writes spanning one or more pages. However,
 	// you should not rely on this. To see individual requests as
 	// submitted by the file system clients, set OpenDirectIO.
 	//
-	// Writes that grow the file are expected to update the file size
-	// (as seen through Attr). Note that file size changes are
-	// communicated also through Setattr.
+	// Note that file size changes are communicated through Setattr.
+	// Writes beyond the size of the file as reported by Attr are not
+	// even attempted (except in OpenDirectIO mode).
 	Write(ctx context.Context, req *fuse.WriteRequest, resp *fuse.WriteResponse) error
 }
 
@@ -330,13 +322,11 @@ type Config struct {
 	// See fuse.Debug for the rules that log functions must follow.
 	Debug func(msg interface{})
 
-	// Function to put things into context for processing the request.
-	// The returned context must have ctx as its parent.
+	// Function to create new contexts. If nil, use
+	// context.Background.
 	//
 	// Note that changing this may not affect existing calls to Serve.
-	//
-	// Must not retain req.
-	WithContext func(ctx context.Context, req fuse.Request) context.Context
+	GetContext func() context.Context
 }
 
 // New returns a new FUSE server ready to serve this kernel FUSE
@@ -352,11 +342,14 @@ func New(conn *fuse.Conn, config *Config) *Server {
 	}
 	if config != nil {
 		s.debug = config.Debug
-		s.context = config.WithContext
+		s.context = config.GetContext
 	}
 	if s.debug == nil {
 		s.debug = fuse.Debug
 	}
+	if s.context == nil {
+		s.context = context.Background
+	}
 	return s
 }
 
@@ -364,7 +357,7 @@ type Server struct {
 	// set in New
 	conn    *fuse.Conn
 	debug   func(msg interface{})
-	context func(ctx context.Context, req fuse.Request) context.Context
+	context func() context.Context
 
 	// set once at Serve time
 	fs           FS
@@ -501,7 +494,7 @@ func (c *Server) saveNode(inode uint64, node Node) (id fuse.NodeID, gen uint64)
 	}
 	sn.generation = c.nodeGen
 	c.nodeRef[node] = id
-	return id, sn.generation
+	return
 }
 
 func (c *Server) saveHandle(handle Handle, nodeID fuse.NodeID) (id fuse.HandleID) {
@@ -608,7 +601,7 @@ type logResponseHeader struct {
 }
 
 func (m logResponseHeader) String() string {
-	return fmt.Sprintf("ID=%v", m.ID)
+	return fmt.Sprintf("ID=%#x", m.ID)
 }
 
 type response struct {
@@ -633,21 +626,21 @@ func (r response) errstr() string {
 func (r response) String() string {
 	switch {
 	case r.Errno != "" && r.Out != nil:
-		return fmt.Sprintf("-> [%v] %v error=%s", r.Request, r.Out, r.errstr())
+		return fmt.Sprintf("-> %s error=%s %s", r.Request, r.errstr(), r.Out)
 	case r.Errno != "":
-		return fmt.Sprintf("-> [%v] %s error=%s", r.Request, r.Op, r.errstr())
+		return fmt.Sprintf("-> %s error=%s", r.Request, r.errstr())
 	case r.Out != nil:
 		// make sure (seemingly) empty values are readable
 		switch r.Out.(type) {
 		case string:
-			return fmt.Sprintf("-> [%v] %s %q", r.Request, r.Op, r.Out)
+			return fmt.Sprintf("-> %s %q", r.Request, r.Out)
 		case []byte:
-			return fmt.Sprintf("-> [%v] %s [% x]", r.Request, r.Op, r.Out)
+			return fmt.Sprintf("-> %s [% x]", r.Request, r.Out)
 		default:
-			return fmt.Sprintf("-> [%v] %v", r.Request, r.Out)
+			return fmt.Sprintf("-> %s %s", r.Request, r.Out)
 		}
 	default:
-		return fmt.Sprintf("-> [%v] %s", r.Request, r.Op)
+		return fmt.Sprintf("-> %s", r.Request)
 	}
 }
 
@@ -659,23 +652,20 @@ type notification struct {
 }
 
 func (n notification) String() string {
-	var buf bytes.Buffer
-	fmt.Fprintf(&buf, "=> %s %v", n.Op, n.Node)
-	if n.Out != nil {
+	switch {
+	case n.Out != nil:
 		// make sure (seemingly) empty values are readable
 		switch n.Out.(type) {
 		case string:
-			fmt.Fprintf(&buf, " %q", n.Out)
+			return fmt.Sprintf("=> %s %d %q Err:%v", n.Op, n.Node, n.Out, n.Err)
 		case []byte:
-			fmt.Fprintf(&buf, " [% x]", n.Out)
+			return fmt.Sprintf("=> %s %d [% x] Err:%v", n.Op, n.Node, n.Out, n.Err)
 		default:
-			fmt.Fprintf(&buf, " %s", n.Out)
+			return fmt.Sprintf("=> %s %d %s Err:%v", n.Op, n.Node, n.Out, n.Err)
 		}
+	default:
+		return fmt.Sprintf("=> %s %d Err:%v", n.Op, n.Node, n.Err)
 	}
-	if n.Err != "" {
-		fmt.Fprintf(&buf, " Err:%v", n.Err)
-	}
-	return buf.String()
 }
 
 type logMissingNode struct {
@@ -695,7 +685,7 @@ type logLinkRequestOldNodeNotFound struct {
 }
 
 func (m *logLinkRequestOldNodeNotFound) String() string {
-	return fmt.Sprintf("In LinkRequest (request %v), node %d not found", m.Request.Hdr().ID, m.In.OldNode)
+	return fmt.Sprintf("In LinkRequest (request %#x), node %d not found", m.Request.Hdr().ID, m.In.OldNode)
 }
 
 type renameNewDirNodeNotFound struct {
@@ -704,7 +694,7 @@ type renameNewDirNodeNotFound struct {
 }
 
 func (m *renameNewDirNodeNotFound) String() string {
-	return fmt.Sprintf("In RenameRequest (request %v), node %d not found", m.Request.Hdr().ID, m.In.NewDir)
+	return fmt.Sprintf("In RenameRequest (request %#x), node %d not found", m.Request.Hdr().ID, m.In.NewDir)
 }
 
 type handlerPanickedError struct {
@@ -727,52 +717,13 @@ func (h handlerPanickedError) Errno() fuse.Errno {
 	return fuse.DefaultErrno
 }
 
-// handlerTerminatedError happens when a handler terminates itself
-// with runtime.Goexit. This is most commonly because of incorrect use
-// of testing.TB.FailNow, typically via t.Fatal.
-type handlerTerminatedError struct {
-	Request interface{}
-}
-
-var _ error = handlerTerminatedError{}
-
-func (h handlerTerminatedError) Error() string {
-	return fmt.Sprintf("handler terminated (called runtime.Goexit)")
-}
-
-var _ fuse.ErrorNumber = handlerTerminatedError{}
-
-func (h handlerTerminatedError) Errno() fuse.Errno {
-	return fuse.DefaultErrno
-}
-
-type handleNotReaderError struct {
-	handle Handle
-}
-
-var _ error = handleNotReaderError{}
-
-func (e handleNotReaderError) Error() string {
-	return fmt.Sprintf("handle has no Read: %T", e.handle)
-}
-
-var _ fuse.ErrorNumber = handleNotReaderError{}
-
-func (e handleNotReaderError) Errno() fuse.Errno {
-	return fuse.ENOTSUP
-}
-
 func initLookupResponse(s *fuse.LookupResponse) {
 	s.EntryValid = entryValidTime
 }
 
 func (c *Server) serve(r fuse.Request) {
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithCancel(c.context())
 	defer cancel()
-	parentCtx := ctx
-	if c.context != nil {
-		ctx = c.context(ctx, r)
-	}
 
 	req := &serveRequest{Request: r, cancel: cancel}
 
@@ -849,7 +800,6 @@ func (c *Server) serve(r fuse.Request) {
 		c.meta.Unlock()
 	}
 
-	var responded bool
 	defer func() {
 		if rec := recover(); rec != nil {
 			const size = 1 << 16
@@ -863,132 +813,114 @@ func (c *Server) serve(r fuse.Request) {
 			}
 			done(err)
 			r.RespondError(err)
-			return
-		}
-
-		if !responded {
-			err := handlerTerminatedError{
-				Request: r,
-			}
-			done(err)
-			r.RespondError(err)
 		}
 	}()
 
-	if err := c.handleRequest(ctx, node, snode, r, done); err != nil {
-		if err == context.Canceled {
-			select {
-			case <-parentCtx.Done():
-				// We canceled the parent context because of an
-				// incoming interrupt request, so return EINTR
-				// to trigger the right behavior in the client app.
-				//
-				// Only do this when it's the parent context that was
-				// canceled, not a context controlled by the program
-				// using this library, so we don't return EINTR too
-				// eagerly -- it might cause busy loops.
-				//
-				// Decent write-up on role of EINTR:
-				// http://250bpm.com/blog:12
-				err = fuse.EINTR
-			default:
-				// nothing
-			}
-		}
-		done(err)
-		r.RespondError(err)
-	}
-
-	// disarm runtime.Goexit protection
-	responded = true
-}
-
-// handleRequest will either a) call done(s) and r.Respond(s) OR b) return an error.
-func (c *Server) handleRequest(ctx context.Context, node Node, snode *serveNode, r fuse.Request, done func(resp interface{})) error {
 	switch r := r.(type) {
 	default:
 		// Note: To FUSE, ENOSYS means "this server never implements this request."
 		// It would be inappropriate to return ENOSYS for other operations in this
 		// switch that might only be unavailable in some contexts, not all.
-		return fuse.ENOSYS
+		done(fuse.ENOSYS)
+		r.RespondError(fuse.ENOSYS)
 
 	case *fuse.StatfsRequest:
 		s := &fuse.StatfsResponse{}
 		if fs, ok := c.fs.(FSStatfser); ok {
 			if err := fs.Statfs(ctx, r, s); err != nil {
-				return err
+				done(err)
+				r.RespondError(err)
+				break
 			}
 		}
 		done(s)
 		r.Respond(s)
-		return nil
 
 	// Node operations.
 	case *fuse.GetattrRequest:
 		s := &fuse.GetattrResponse{}
 		if n, ok := node.(NodeGetattrer); ok {
 			if err := n.Getattr(ctx, r, s); err != nil {
-				return err
+				done(err)
+				r.RespondError(err)
+				break
 			}
 		} else {
 			if err := snode.attr(ctx, &s.Attr); err != nil {
-				return err
+				done(err)
+				r.RespondError(err)
+				break
 			}
 		}
 		done(s)
 		r.Respond(s)
-		return nil
 
 	case *fuse.SetattrRequest:
 		s := &fuse.SetattrResponse{}
 		if n, ok := node.(NodeSetattrer); ok {
 			if err := n.Setattr(ctx, r, s); err != nil {
-				return err
+				done(err)
+				r.RespondError(err)
+				break
 			}
+			done(s)
+			r.Respond(s)
+			break
 		}
 
 		if err := snode.attr(ctx, &s.Attr); err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		done(s)
 		r.Respond(s)
-		return nil
 
 	case *fuse.SymlinkRequest:
 		s := &fuse.SymlinkResponse{}
 		initLookupResponse(&s.LookupResponse)
 		n, ok := node.(NodeSymlinker)
 		if !ok {
-			return fuse.EIO // XXX or EPERM like Mkdir?
+			done(fuse.EIO) // XXX or EPERM like Mkdir?
+			r.RespondError(fuse.EIO)
+			break
 		}
 		n2, err := n.Symlink(ctx, r)
 		if err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		if err := c.saveLookup(ctx, &s.LookupResponse, snode, r.NewName, n2); err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		done(s)
 		r.Respond(s)
-		return nil
 
 	case *fuse.ReadlinkRequest:
 		n, ok := node.(NodeReadlinker)
 		if !ok {
-			return fuse.EIO /// XXX or EPERM?
+			done(fuse.EIO) /// XXX or EPERM?
+			r.RespondError(fuse.EIO)
+			break
 		}
 		target, err := n.Readlink(ctx, r)
 		if err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		done(target)
 		r.Respond(target)
-		return nil
 
 	case *fuse.LinkRequest:
 		n, ok := node.(NodeLinker)
 		if !ok {
-			return fuse.EIO /// XXX or EPERM?
+			done(fuse.EIO) /// XXX or EPERM?
+			r.RespondError(fuse.EIO)
+			break
 		}
 		c.meta.Lock()
 		var oldNode *serveNode
@@ -1001,43 +933,52 @@ func (c *Server) handleRequest(ctx context.Context, node Node, snode *serveNode,
 				Request: r.Hdr(),
 				In:      r,
 			})
-			return fuse.EIO
+			done(fuse.EIO)
+			r.RespondError(fuse.EIO)
+			break
 		}
 		n2, err := n.Link(ctx, r, oldNode.node)
 		if err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		s := &fuse.LookupResponse{}
 		initLookupResponse(s)
 		if err := c.saveLookup(ctx, s, snode, r.NewName, n2); err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		done(s)
 		r.Respond(s)
-		return nil
 
 	case *fuse.RemoveRequest:
 		n, ok := node.(NodeRemover)
 		if !ok {
-			return fuse.EIO /// XXX or EPERM?
+			done(fuse.EIO) /// XXX or EPERM?
+			r.RespondError(fuse.EIO)
+			break
 		}
 		err := n.Remove(ctx, r)
 		if err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		done(nil)
 		r.Respond()
-		return nil
 
 	case *fuse.AccessRequest:
 		if n, ok := node.(NodeAccesser); ok {
 			if err := n.Access(ctx, r); err != nil {
-				return err
+				done(err)
+				r.RespondError(err)
+				break
 			}
 		}
 		done(nil)
 		r.Respond()
-		return nil
 
 	case *fuse.LookupRequest:
 		var n2 Node
@@ -1049,35 +990,45 @@ func (c *Server) handleRequest(ctx context.Context, node Node, snode *serveNode,
 		} else if n, ok := node.(NodeRequestLookuper); ok {
 			n2, err = n.Lookup(ctx, r, s)
 		} else {
-			return fuse.ENOENT
+			done(fuse.ENOENT)
+			r.RespondError(fuse.ENOENT)
+			break
 		}
 		if err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		if err := c.saveLookup(ctx, s, snode, r.Name, n2); err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		done(s)
 		r.Respond(s)
-		return nil
 
 	case *fuse.MkdirRequest:
 		s := &fuse.MkdirResponse{}
 		initLookupResponse(&s.LookupResponse)
 		n, ok := node.(NodeMkdirer)
 		if !ok {
-			return fuse.EPERM
+			done(fuse.EPERM)
+			r.RespondError(fuse.EPERM)
+			break
 		}
 		n2, err := n.Mkdir(ctx, r)
 		if err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		if err := c.saveLookup(ctx, &s.LookupResponse, snode, r.Name, n2); err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		done(s)
 		r.Respond(s)
-		return nil
 
 	case *fuse.OpenRequest:
 		s := &fuse.OpenResponse{}
@@ -1085,99 +1036,121 @@ func (c *Server) handleRequest(ctx context.Context, node Node, snode *serveNode,
 		if n, ok := node.(NodeOpener); ok {
 			hh, err := n.Open(ctx, r, s)
 			if err != nil {
-				return err
+				done(err)
+				r.RespondError(err)
+				break
 			}
 			h2 = hh
 		} else {
 			h2 = node
 		}
-		s.Handle = c.saveHandle(h2, r.Hdr().Node)
+		s.Handle = c.saveHandle(h2, hdr.Node)
 		done(s)
 		r.Respond(s)
-		return nil
 
 	case *fuse.CreateRequest:
 		n, ok := node.(NodeCreater)
 		if !ok {
 			// If we send back ENOSYS, FUSE will try mknod+open.
-			return fuse.EPERM
+			done(fuse.EPERM)
+			r.RespondError(fuse.EPERM)
+			break
 		}
 		s := &fuse.CreateResponse{OpenResponse: fuse.OpenResponse{}}
 		initLookupResponse(&s.LookupResponse)
 		n2, h2, err := n.Create(ctx, r, s)
 		if err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		if err := c.saveLookup(ctx, &s.LookupResponse, snode, r.Name, n2); err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
-		s.Handle = c.saveHandle(h2, r.Hdr().Node)
+		s.Handle = c.saveHandle(h2, hdr.Node)
 		done(s)
 		r.Respond(s)
-		return nil
 
 	case *fuse.GetxattrRequest:
 		n, ok := node.(NodeGetxattrer)
 		if !ok {
-			return fuse.ENOTSUP
+			done(fuse.ENOTSUP)
+			r.RespondError(fuse.ENOTSUP)
+			break
 		}
 		s := &fuse.GetxattrResponse{}
 		err := n.Getxattr(ctx, r, s)
 		if err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		if r.Size != 0 && uint64(len(s.Xattr)) > uint64(r.Size) {
-			return fuse.ERANGE
+			done(fuse.ERANGE)
+			r.RespondError(fuse.ERANGE)
+			break
 		}
 		done(s)
 		r.Respond(s)
-		return nil
 
 	case *fuse.ListxattrRequest:
 		n, ok := node.(NodeListxattrer)
 		if !ok {
-			return fuse.ENOTSUP
+			done(fuse.ENOTSUP)
+			r.RespondError(fuse.ENOTSUP)
+			break
 		}
 		s := &fuse.ListxattrResponse{}
 		err := n.Listxattr(ctx, r, s)
 		if err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		if r.Size != 0 && uint64(len(s.Xattr)) > uint64(r.Size) {
-			return fuse.ERANGE
+			done(fuse.ERANGE)
+			r.RespondError(fuse.ERANGE)
+			break
 		}
 		done(s)
 		r.Respond(s)
-		return nil
 
 	case *fuse.SetxattrRequest:
 		n, ok := node.(NodeSetxattrer)
 		if !ok {
-			return fuse.ENOTSUP
+			done(fuse.ENOTSUP)
+			r.RespondError(fuse.ENOTSUP)
+			break
 		}
 		err := n.Setxattr(ctx, r)
 		if err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		done(nil)
 		r.Respond()
-		return nil
 
 	case *fuse.RemovexattrRequest:
 		n, ok := node.(NodeRemovexattrer)
 		if !ok {
-			return fuse.ENOTSUP
+			done(fuse.ENOTSUP)
+			r.RespondError(fuse.ENOTSUP)
+			break
 		}
 		err := n.Removexattr(ctx, r)
 		if err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		done(nil)
 		r.Respond()
-		return nil
 
 	case *fuse.ForgetRequest:
-		forget := c.dropNode(r.Hdr().Node, r.N)
+		forget := c.dropNode(hdr.Node, r.N)
 		if forget {
 			n, ok := node.(NodeForgetter)
 			if ok {
@@ -1186,29 +1159,26 @@ func (c *Server) handleRequest(ctx context.Context, node Node, snode *serveNode,
 		}
 		done(nil)
 		r.Respond()
-		return nil
 
 	// Handle operations.
 	case *fuse.ReadRequest:
 		shandle := c.getHandle(r.Handle)
 		if shandle == nil {
-			return fuse.ESTALE
+			done(fuse.ESTALE)
+			r.RespondError(fuse.ESTALE)
+			return
 		}
 		handle := shandle.handle
 
 		s := &fuse.ReadResponse{Data: make([]byte, 0, r.Size)}
 		if r.Dir {
 			if h, ok := handle.(HandleReadDirAller); ok {
-				// detect rewinddir(3) or similar seek and refresh
-				// contents
-				if r.Offset == 0 {
-					shandle.readData = nil
-				}
-
 				if shandle.readData == nil {
 					dirs, err := h.ReadDirAll(ctx)
 					if err != nil {
-						return err
+						done(err)
+						r.RespondError(err)
+						break
 					}
 					var data []byte
 					for _, dir := range dirs {
@@ -1222,14 +1192,16 @@ func (c *Server) handleRequest(ctx context.Context, node Node, snode *serveNode,
 				fuseutil.HandleRead(r, s, shandle.readData)
 				done(s)
 				r.Respond(s)
-				return nil
+				break
 			}
 		} else {
 			if h, ok := handle.(HandleReadAller); ok {
 				if shandle.readData == nil {
 					data, err := h.ReadAll(ctx)
 					if err != nil {
-						return err
+						done(err)
+						r.RespondError(err)
+						break
 					}
 					if data == nil {
 						data = []byte{}
@@ -1239,58 +1211,71 @@ func (c *Server) handleRequest(ctx context.Context, node Node, snode *serveNode,
 				fuseutil.HandleRead(r, s, shandle.readData)
 				done(s)
 				r.Respond(s)
-				return nil
+				break
 			}
 			h, ok := handle.(HandleReader)
 			if !ok {
-				err := handleNotReaderError{handle: handle}
-				return err
+				fmt.Printf("NO READ FOR %T\n", handle)
+				done(fuse.EIO)
+				r.RespondError(fuse.EIO)
+				break
 			}
 			if err := h.Read(ctx, r, s); err != nil {
-				return err
+				done(err)
+				r.RespondError(err)
+				break
 			}
 		}
 		done(s)
 		r.Respond(s)
-		return nil
 
 	case *fuse.WriteRequest:
 		shandle := c.getHandle(r.Handle)
 		if shandle == nil {
-			return fuse.ESTALE
+			done(fuse.ESTALE)
+			r.RespondError(fuse.ESTALE)
+			return
 		}
 
 		s := &fuse.WriteResponse{}
 		if h, ok := shandle.handle.(HandleWriter); ok {
 			if err := h.Write(ctx, r, s); err != nil {
-				return err
+				done(err)
+				r.RespondError(err)
+				break
 			}
 			done(s)
 			r.Respond(s)
-			return nil
+			break
 		}
-		return fuse.EIO
+		done(fuse.EIO)
+		r.RespondError(fuse.EIO)
 
 	case *fuse.FlushRequest:
 		shandle := c.getHandle(r.Handle)
 		if shandle == nil {
-			return fuse.ESTALE
+			done(fuse.ESTALE)
+			r.RespondError(fuse.ESTALE)
+			return
 		}
 		handle := shandle.handle
 
 		if h, ok := handle.(HandleFlusher); ok {
 			if err := h.Flush(ctx, r); err != nil {
-				return err
+				done(err)
+				r.RespondError(err)
+				break
 			}
 		}
 		done(nil)
 		r.Respond()
-		return nil
 
 	case *fuse.ReleaseRequest:
 		shandle := c.getHandle(r.Handle)
 		if shandle == nil {
-			return fuse.ESTALE
+			done(fuse.ESTALE)
+			r.RespondError(fuse.ESTALE)
+			return
 		}
 		handle := shandle.handle
 
@@ -1299,12 +1284,13 @@ func (c *Server) handleRequest(ctx context.Context, node Node, snode *serveNode,
 
 		if h, ok := handle.(HandleReleaser); ok {
 			if err := h.Release(ctx, r); err != nil {
-				return err
+				done(err)
+				r.RespondError(err)
+				break
 			}
 		}
 		done(nil)
 		r.Respond()
-		return nil
 
 	case *fuse.DestroyRequest:
 		if fs, ok := c.fs.(FSDestroyer); ok {
@@ -1312,7 +1298,6 @@ func (c *Server) handleRequest(ctx context.Context, node Node, snode *serveNode,
 		}
 		done(nil)
 		r.Respond()
-		return nil
 
 	case *fuse.RenameRequest:
 		c.meta.Lock()
@@ -1326,50 +1311,63 @@ func (c *Server) handleRequest(ctx context.Context, node Node, snode *serveNode,
 				Request: r.Hdr(),
 				In:      r,
 			})
-			return fuse.EIO
+			done(fuse.EIO)
+			r.RespondError(fuse.EIO)
+			break
 		}
 		n, ok := node.(NodeRenamer)
 		if !ok {
-			return fuse.EIO // XXX or EPERM like Mkdir?
+			done(fuse.EIO) // XXX or EPERM like Mkdir?
+			r.RespondError(fuse.EIO)
+			break
 		}
 		err := n.Rename(ctx, r, newDirNode.node)
 		if err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		done(nil)
 		r.Respond()
-		return nil
 
 	case *fuse.MknodRequest:
 		n, ok := node.(NodeMknoder)
 		if !ok {
-			return fuse.EIO
+			done(fuse.EIO)
+			r.RespondError(fuse.EIO)
+			break
 		}
 		n2, err := n.Mknod(ctx, r)
 		if err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		s := &fuse.LookupResponse{}
 		initLookupResponse(s)
 		if err := c.saveLookup(ctx, s, snode, r.Name, n2); err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		done(s)
 		r.Respond(s)
-		return nil
 
 	case *fuse.FsyncRequest:
 		n, ok := node.(NodeFsyncer)
 		if !ok {
-			return fuse.EIO
+			done(fuse.EIO)
+			r.RespondError(fuse.EIO)
+			break
 		}
 		err := n.Fsync(ctx, r)
 		if err != nil {
-			return err
+			done(err)
+			r.RespondError(err)
+			break
 		}
 		done(nil)
 		r.Respond()
-		return nil
 
 	case *fuse.InterruptRequest:
 		c.meta.Lock()
@@ -1381,23 +1379,24 @@ func (c *Server) handleRequest(ctx context.Context, node Node, snode *serveNode,
 		c.meta.Unlock()
 		done(nil)
 		r.Respond()
-		return nil
 
 		/*	case *FsyncdirRequest:
-				return ENOSYS
+				done(ENOSYS)
+				r.RespondError(ENOSYS)
 
 			case *GetlkRequest, *SetlkRequest, *SetlkwRequest:
-				return ENOSYS
+				done(ENOSYS)
+				r.RespondError(ENOSYS)
 
 			case *BmapRequest:
-				return ENOSYS
+				done(ENOSYS)
+				r.RespondError(ENOSYS)
 
 			case *SetvolnameRequest, *GetxtimesRequest, *ExchangeRequest:
-				return ENOSYS
+				done(ENOSYS)
+				r.RespondError(ENOSYS)
 		*/
 	}
-
-	panic("not reached")
 }
 
 func (c *Server) saveLookup(ctx context.Context, s *fuse.LookupResponse, snode *serveNode, elem string, n2 Node) error {

Godeps/_workspace/src/bazil.org/fuse/fuse.go

@@ -98,7 +98,7 @@
 // Behavior and metadata of the mounted file system can be changed by
 // passing MountOption values to Mount.
 //
-package fuse // import "bazil.org/fuse"
+package fuse
 
 import (
 	"bytes"
@@ -132,18 +132,6 @@ type Conn struct {
 	proto Protocol
 }
 
-// MountpointDoesNotExistError is an error returned when the
-// mountpoint does not exist.
-type MountpointDoesNotExistError struct {
-	Path string
-}
-
-var _ error = (*MountpointDoesNotExistError)(nil)
-
-func (e *MountpointDoesNotExistError) Error() string {
-	return fmt.Sprintf("mountpoint does not exist: %v", e.Path)
-}
-
 // Mount mounts a new FUSE connection on the named directory
 // and returns a connection for reading and writing FUSE messages.
 //
@@ -176,13 +164,6 @@ func Mount(dir string, options ...MountOption) (*Conn, error) {
 
 	if err := initMount(c, &conf); err != nil {
 		c.Close()
-		if err == ErrClosedWithoutInit {
-			// see if we can provide a better error
-			<-c.Ready
-			if err := c.MountError; err != nil {
-				return nil, err
-			}
-		}
 		return nil, err
 	}
 
@@ -198,15 +179,11 @@ func (e *OldVersionError) Error() string {
 	return fmt.Sprintf("kernel FUSE version is too old: %v < %v", e.Kernel, e.LibraryMin)
 }
 
-var (
-	ErrClosedWithoutInit = errors.New("fuse connection closed without init")
-)
-
 func initMount(c *Conn, conf *mountConfig) error {
 	req, err := c.ReadRequest()
 	if err != nil {
 		if err == io.EOF {
-			return ErrClosedWithoutInit
+			return fmt.Errorf("missing init, got EOF")
 		}
 		return err
 	}
@@ -235,7 +212,7 @@ func initMount(c *Conn, conf *mountConfig) error {
 	s := &InitResponse{
 		Library:      proto,
 		MaxReadahead: conf.maxReadahead,
-		MaxWrite:     maxWrite,
+		MaxWrite:     128 * 1024,
 		Flags:        InitBigWrites | conf.initFlags,
 	}
 	r.Respond(s)
@@ -258,27 +235,15 @@ type Request interface {
 // A RequestID identifies an active FUSE request.
 type RequestID uint64
 
-func (r RequestID) String() string {
-	return fmt.Sprintf("%#x", uint64(r))
-}
-
 // A NodeID is a number identifying a directory or file.
 // It must be unique among IDs returned in LookupResponses
 // that have not yet been forgotten by ForgetRequests.
 type NodeID uint64
 
-func (n NodeID) String() string {
-	return fmt.Sprintf("%#x", uint64(n))
-}
-
 // A HandleID is a number identifying an open directory or file.
 // It only needs to be unique while the directory or file is open.
 type HandleID uint64
 
-func (h HandleID) String() string {
-	return fmt.Sprintf("%#x", uint64(h))
-}
-
 // The RootID identifies the root directory of a FUSE file system.
 const RootID NodeID = rootID
 
@@ -296,7 +261,7 @@ type Header struct {
 }
 
 func (h *Header) String() string {
-	return fmt.Sprintf("ID=%v Node=%v Uid=%d Gid=%d Pid=%d", h.ID, h.Node, h.Uid, h.Gid, h.Pid)
+	return fmt.Sprintf("ID=%#x Node=%#x Uid=%d Gid=%d Pid=%d", h.ID, h.Node, h.Uid, h.Gid, h.Pid)
 }
 
 func (h *Header) Hdr() *Header {
@@ -403,6 +368,9 @@ func (h *Header) RespondError(err error) {
 	h.respond(buf)
 }
 
+// Maximum file write size we are prepared to receive from the kernel.
+const maxWrite = 16 * 1024 * 1024
+
 // All requests read from the kernel, without data, are shorter than
 // this.
 var maxRequestSize = syscall.Getpagesize()
@@ -1017,33 +985,7 @@ loop:
 	case opGetxtimes:
 		panic("opGetxtimes")
 	case opExchange:
-		in := (*exchangeIn)(m.data())
-		if m.len() < unsafe.Sizeof(*in) {
-			goto corrupt
-		}
-		oldDirNodeID := NodeID(in.Olddir)
-		newDirNodeID := NodeID(in.Newdir)
-		oldNew := m.bytes()[unsafe.Sizeof(*in):]
-		// oldNew should be "oldname\x00newname\x00"
-		if len(oldNew) < 4 {
-			goto corrupt
-		}
-		if oldNew[len(oldNew)-1] != '\x00' {
-			goto corrupt
-		}
-		i := bytes.IndexByte(oldNew, '\x00')
-		if i < 0 {
-			goto corrupt
-		}
-		oldName, newName := string(oldNew[:i]), string(oldNew[i+1:len(oldNew)-1])
-		req = &ExchangeDataRequest{
-			Header:  m.Header(),
-			OldDir:  oldDirNodeID,
-			NewDir:  newDirNodeID,
-			OldName: oldName,
-			NewName: newName,
-			// TODO options
-		}
+		panic("opExchange")
 	}
 
 	return req, nil
@@ -1205,7 +1147,7 @@ type InitRequest struct {
 var _ = Request(&InitRequest{})
 
 func (r *InitRequest) String() string {
-	return fmt.Sprintf("Init [%v] %v ra=%d fl=%v", &r.Header, r.Kernel, r.MaxReadahead, r.Flags)
+	return fmt.Sprintf("Init [%s] %v ra=%d fl=%v", &r.Header, r.Kernel, r.MaxReadahead, r.Flags)
 }
 
 // An InitResponse is the response to an InitRequest.
@@ -1221,7 +1163,7 @@ type InitResponse struct {
 }
 
 func (r *InitResponse) String() string {
-	return fmt.Sprintf("Init %v ra=%d fl=%v w=%d", r.Library, r.MaxReadahead, r.Flags, r.MaxWrite)
+	return fmt.Sprintf("Init %+v", *r)
 }
 
 // Respond replies to the request with the given response.
@@ -1262,7 +1204,6 @@ func (r *StatfsRequest) Respond(resp *StatfsResponse) {
 		Bfree:   resp.Bfree,
 		Bavail:  resp.Bavail,
 		Files:   resp.Files,
-		Ffree:   resp.Ffree,
 		Bsize:   resp.Bsize,
 		Namelen: resp.Namelen,
 		Frsize:  resp.Frsize,
@@ -1283,13 +1224,7 @@ type StatfsResponse struct {
 }
 
 func (r *StatfsResponse) String() string {
-	return fmt.Sprintf("Statfs blocks=%d/%d/%d files=%d/%d bsize=%d frsize=%d namelen=%d",
-		r.Bavail, r.Bfree, r.Blocks,
-		r.Ffree, r.Files,
-		r.Bsize,
-		r.Frsize,
-		r.Namelen,
-	)
+	return fmt.Sprintf("Statfs %+v", *r)
 }
 
 // An AccessRequest asks whether the file can be accessed
@@ -1324,7 +1259,7 @@ type Attr struct {
 	Ctime     time.Time   // time of last inode change
 	Crtime    time.Time   // time of creation (OS X only)
 	Mode      os.FileMode // file mode
-	Nlink     uint32      // number of links (usually 1)
+	Nlink     uint32      // number of links
 	Uid       uint32      // owner uid
 	Gid       uint32      // group gid
 	Rdev      uint32      // device numbers
@@ -1332,10 +1267,6 @@ type Attr struct {
 	BlockSize uint32      // preferred blocksize for filesystem I/O
 }
 
-func (a Attr) String() string {
-	return fmt.Sprintf("valid=%v ino=%v size=%d mode=%v", a.Valid, a.Inode, a.Size, a.Mode)
-}
-
 func unix(t time.Time) (sec uint64, nsec uint32) {
 	nano := t.UnixNano()
 	sec = uint64(nano / 1e9)
@@ -1398,7 +1329,7 @@ type GetattrRequest struct {
 var _ = Request(&GetattrRequest{})
 
 func (r *GetattrRequest) String() string {
-	return fmt.Sprintf("Getattr [%s] %v fl=%v", &r.Header, r.Handle, r.Flags)
+	return fmt.Sprintf("Getattr [%s] %#x fl=%v", &r.Header, r.Handle, r.Flags)
 }
 
 // Respond replies to the request with the given response.
@@ -1418,7 +1349,7 @@ type GetattrResponse struct {
 }
 
 func (r *GetattrResponse) String() string {
-	return fmt.Sprintf("Getattr %v", r.Attr)
+	return fmt.Sprintf("Getattr %+v", *r)
 }
 
 // A GetxattrRequest asks for the extended attributes associated with r.Node.
@@ -1609,12 +1540,8 @@ type LookupResponse struct {
 	Attr       Attr
 }
 
-func (r *LookupResponse) string() string {
-	return fmt.Sprintf("%v gen=%d valid=%v attr={%v}", r.Node, r.Generation, r.EntryValid, r.Attr)
-}
-
 func (r *LookupResponse) String() string {
-	return fmt.Sprintf("Lookup %s", r.string())
+	return fmt.Sprintf("Lookup %+v", *r)
 }
 
 // An OpenRequest asks to open a file or directory
@@ -1645,12 +1572,8 @@ type OpenResponse struct {
 	Flags  OpenResponseFlags
 }
 
-func (r *OpenResponse) string() string {
-	return fmt.Sprintf("%v fl=%v", r.Handle, r.Flags)
-}
-
 func (r *OpenResponse) String() string {
-	return fmt.Sprintf("Open %s", r.string())
+	return fmt.Sprintf("Open %+v", *r)
 }
 
 // A CreateRequest asks to create and open a file (not a directory).
@@ -1659,8 +1582,7 @@ type CreateRequest struct {
 	Name   string
 	Flags  OpenFlags
 	Mode   os.FileMode
-	// Umask of the request. Not supported on OS X.
-	Umask os.FileMode
+	Umask  os.FileMode
 }
 
 var _ = Request(&CreateRequest{})
@@ -1698,7 +1620,7 @@ type CreateResponse struct {
 }
 
 func (r *CreateResponse) String() string {
-	return fmt.Sprintf("Create {%s} {%s}", r.LookupResponse.string(), r.OpenResponse.string())
+	return fmt.Sprintf("Create %+v", *r)
 }
 
 // A MkdirRequest asks to create (but not open) a directory.
@@ -1706,8 +1628,7 @@ type MkdirRequest struct {
 	Header `json:"-"`
 	Name   string
 	Mode   os.FileMode
-	// Umask of the request. Not supported on OS X.
-	Umask os.FileMode
+	Umask  os.FileMode
 }
 
 var _ = Request(&MkdirRequest{})
@@ -1737,7 +1658,7 @@ type MkdirResponse struct {
 }
 
 func (r *MkdirResponse) String() string {
-	return fmt.Sprintf("Mkdir %v", r.LookupResponse.string())
+	return fmt.Sprintf("Mkdir %+v", *r)
 }
 
 // A ReadRequest asks to read from an open file.
@@ -1755,7 +1676,7 @@ type ReadRequest struct {
 var _ = Request(&ReadRequest{})
 
 func (r *ReadRequest) String() string {
-	return fmt.Sprintf("Read [%s] %v %d @%#x dir=%v fl=%v lock=%d ffl=%v", &r.Header, r.Handle, r.Size, r.Offset, r.Dir, r.Flags, r.LockOwner, r.FileFlags)
+	return fmt.Sprintf("Read [%s] %#x %d @%#x dir=%v fl=%v lock=%d ffl=%v", &r.Header, r.Handle, r.Size, r.Offset, r.Dir, r.Flags, r.LockOwner, r.FileFlags)
 }
 
 // Respond replies to the request with the given response.
@@ -1798,7 +1719,7 @@ type ReleaseRequest struct {
 var _ = Request(&ReleaseRequest{})
 
 func (r *ReleaseRequest) String() string {
-	return fmt.Sprintf("Release [%s] %v fl=%v rfl=%v owner=%#x", &r.Header, r.Handle, r.Flags, r.ReleaseFlags, r.LockOwner)
+	return fmt.Sprintf("Release [%s] %#x fl=%v rfl=%v owner=%#x", &r.Header, r.Handle, r.Flags, r.ReleaseFlags, r.LockOwner)
 }
 
 // Respond replies to the request, indicating that the handle has been released.
@@ -1940,7 +1861,7 @@ type WriteRequest struct {
 var _ = Request(&WriteRequest{})
 
 func (r *WriteRequest) String() string {
-	return fmt.Sprintf("Write [%s] %v %d @%d fl=%v lock=%d ffl=%v", &r.Header, r.Handle, len(r.Data), r.Offset, r.Flags, r.LockOwner, r.FileFlags)
+	return fmt.Sprintf("Write [%s] %#x %d @%d fl=%v lock=%d ffl=%v", &r.Header, r.Handle, len(r.Data), r.Offset, r.Flags, r.LockOwner, r.FileFlags)
 }
 
 type jsonWriteRequest struct {
@@ -1974,7 +1895,7 @@ type WriteResponse struct {
 }
 
 func (r *WriteResponse) String() string {
-	return fmt.Sprintf("Write %d", r.Size)
+	return fmt.Sprintf("Write %+v", *r)
 }
 
 // A SetattrRequest asks to change one or more attributes associated with a file,
@@ -2027,9 +1948,9 @@ func (r *SetattrRequest) String() string {
 		fmt.Fprintf(&buf, " mtime=now")
 	}
 	if r.Valid.Handle() {
-		fmt.Fprintf(&buf, " handle=%v", r.Handle)
+		fmt.Fprintf(&buf, " handle=%#x", r.Handle)
 	} else {
-		fmt.Fprintf(&buf, " handle=INVALID-%v", r.Handle)
+		fmt.Fprintf(&buf, " handle=INVALID-%#x", r.Handle)
 	}
 	if r.Valid.LockOwner() {
 		fmt.Fprintf(&buf, " lockowner")
@@ -2044,7 +1965,7 @@ func (r *SetattrRequest) String() string {
 		fmt.Fprintf(&buf, " bkuptime=%v", r.Bkuptime)
 	}
 	if r.Valid.Flags() {
-		fmt.Fprintf(&buf, " flags=%v", r.Flags)
+		fmt.Fprintf(&buf, " flags=%#x", r.Flags)
 	}
 	return buf.String()
 }
@@ -2067,7 +1988,7 @@ type SetattrResponse struct {
 }
 
 func (r *SetattrResponse) String() string {
-	return fmt.Sprintf("Setattr %v", r.Attr)
+	return fmt.Sprintf("Setattr %+v", *r)
 }
 
 // A FlushRequest asks for the current state of an open file to be flushed
@@ -2083,7 +2004,7 @@ type FlushRequest struct {
 var _ = Request(&FlushRequest{})
 
 func (r *FlushRequest) String() string {
-	return fmt.Sprintf("Flush [%s] %v fl=%#x lk=%#x", &r.Header, r.Handle, r.Flags, r.LockOwner)
+	return fmt.Sprintf("Flush [%s] %#x fl=%#x lk=%#x", &r.Header, r.Handle, r.Flags, r.LockOwner)
 }
 
 // Respond replies to the request, indicating that the flush succeeded.
@@ -2144,10 +2065,6 @@ type SymlinkResponse struct {
 	LookupResponse
 }
 
-func (r *SymlinkResponse) String() string {
-	return fmt.Sprintf("Symlink %v", r.LookupResponse.string())
-}
-
 // A ReadlinkRequest is a request to read a symlink's target.
 type ReadlinkRequest struct {
 	Header `json:"-"`
@@ -2202,7 +2119,7 @@ type RenameRequest struct {
 var _ = Request(&RenameRequest{})
 
 func (r *RenameRequest) String() string {
-	return fmt.Sprintf("Rename [%s] from %q to dirnode %v %q", &r.Header, r.OldName, r.NewDir, r.NewName)
+	return fmt.Sprintf("Rename [%s] from %q to dirnode %d %q", &r.Header, r.OldName, r.NewDir, r.NewName)
 }
 
 func (r *RenameRequest) Respond() {
@@ -2215,8 +2132,7 @@ type MknodRequest struct {
 	Name   string
 	Mode   os.FileMode
 	Rdev   uint32
-	// Umask of the request. Not supported on OS X.
-	Umask os.FileMode
+	Umask  os.FileMode
 }
 
 var _ = Request(&MknodRequest{})
@@ -2275,30 +2191,3 @@ func (r *InterruptRequest) Respond() {
 func (r *InterruptRequest) String() string {
 	return fmt.Sprintf("Interrupt [%s] ID %v", &r.Header, r.IntrID)
 }
-
-// An ExchangeDataRequest is a request to exchange the contents of two
-// files, while leaving most metadata untouched.
-//
-// This request comes from OS X exchangedata(2) and represents its
-// specific semantics. Crucially, it is very different from Linux
-// renameat(2) RENAME_EXCHANGE.
-//
-// https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man2/exchangedata.2.html
-type ExchangeDataRequest struct {
-	Header           `json:"-"`
-	OldDir, NewDir   NodeID
-	OldName, NewName string
-	// TODO options
-}
-
-var _ = Request(&ExchangeDataRequest{})
-
-func (r *ExchangeDataRequest) String() string {
-	// TODO options
-	return fmt.Sprintf("ExchangeData [%s] %v %q and %v %q", &r.Header, r.OldDir, r.OldName, r.NewDir, r.NewName)
-}
-
-func (r *ExchangeDataRequest) Respond() {
-	buf := newBuffer(0)
-	r.respond(buf)
-}

Godeps/_workspace/src/bazil.org/fuse/fuse_kernel.go

@@ -62,7 +62,7 @@ type kstatfs struct {
 	Bsize   uint32
 	Namelen uint32
 	Frsize  uint32
-	_       uint32
+	Padding uint32
 	Spare   [6]uint32
 }
 
@@ -159,13 +159,9 @@ const (
 	OpenWriteOnly OpenFlags = syscall.O_WRONLY
 	OpenReadWrite OpenFlags = syscall.O_RDWR
 
-	// File was opened in append-only mode, all writes will go to end
-	// of file. OS X does not provide this information.
 	OpenAppend    OpenFlags = syscall.O_APPEND
 	OpenCreate    OpenFlags = syscall.O_CREAT
-	OpenDirectory OpenFlags = syscall.O_DIRECTORY
 	OpenExclusive OpenFlags = syscall.O_EXCL
-	OpenNonblock  OpenFlags = syscall.O_NONBLOCK
 	OpenSync      OpenFlags = syscall.O_SYNC
 	OpenTruncate  OpenFlags = syscall.O_TRUNC
 )
@@ -217,13 +213,11 @@ func accModeName(flags OpenFlags) string {
 }
 
 var openFlagNames = []flagName{
-	{uint32(OpenAppend), "OpenAppend"},
 	{uint32(OpenCreate), "OpenCreate"},
-	{uint32(OpenDirectory), "OpenDirectory"},
 	{uint32(OpenExclusive), "OpenExclusive"},
-	{uint32(OpenNonblock), "OpenNonblock"},
-	{uint32(OpenSync), "OpenSync"},
 	{uint32(OpenTruncate), "OpenTruncate"},
+	{uint32(OpenAppend), "OpenAppend"},
+	{uint32(OpenSync), "OpenSync"},
 }
 
 // The OpenResponseFlags are returned in the OpenResponse.
@@ -254,13 +248,12 @@ var openResponseFlagNames = []flagName{
 type InitFlags uint32
 
 const (
-	InitAsyncRead     InitFlags = 1 << 0
-	InitPosixLocks    InitFlags = 1 << 1
-	InitFileOps       InitFlags = 1 << 2
-	InitAtomicTrunc   InitFlags = 1 << 3
-	InitExportSupport InitFlags = 1 << 4
-	InitBigWrites     InitFlags = 1 << 5
-	// Do not mask file access modes with umask. Not supported on OS X.
+	InitAsyncRead       InitFlags = 1 << 0
+	InitPosixLocks      InitFlags = 1 << 1
+	InitFileOps         InitFlags = 1 << 2
+	InitAtomicTrunc     InitFlags = 1 << 3
+	InitExportSupport   InitFlags = 1 << 4
+	InitBigWrites       InitFlags = 1 << 5
 	InitDontMask        InitFlags = 1 << 6
 	InitSpliceWrite     InitFlags = 1 << 7
 	InitSpliceMove      InitFlags = 1 << 8
@@ -419,14 +412,14 @@ type forgetIn struct {
 
 type getattrIn struct {
 	GetattrFlags uint32
-	_            uint32
+	dummy        uint32
 	Fh           uint64
 }
 
 type attrOut struct {
 	AttrValid     uint64 // Cache timeout for the attributes
 	AttrValidNsec uint32
-	_             uint32
+	Dummy         uint32
 	Attr          attr
 }
 
@@ -448,10 +441,10 @@ type getxtimesOut struct {
 }
 
 type mknodIn struct {
-	Mode  uint32
-	Rdev  uint32
-	Umask uint32
-	_     uint32
+	Mode    uint32
+	Rdev    uint32
+	Umask   uint32
+	padding uint32
 	// "filename\x00" follows.
 }
 
@@ -489,7 +482,6 @@ type exchangeIn struct {
 	Olddir  uint64
 	Newdir  uint64
 	Options uint64
-	// "oldname\x00newname\x00" follows
 }
 
 type linkIn struct {
@@ -498,7 +490,7 @@ type linkIn struct {
 
 type setattrInCommon struct {
 	Valid     uint32
-	_         uint32
+	Padding   uint32
 	Fh        uint64
 	Size      uint64
 	LockOwner uint64 // unused on OS X?
@@ -523,14 +515,14 @@ type openIn struct {
 type openOut struct {
 	Fh        uint64
 	OpenFlags uint32
-	_         uint32
+	Padding   uint32
 }
 
 type createIn struct {
-	Flags uint32
-	Mode  uint32
-	Umask uint32
-	_     uint32
+	Flags   uint32
+	Mode    uint32
+	Umask   uint32
+	padding uint32
 }
 
 func createInSize(p Protocol) uintptr {
@@ -552,7 +544,7 @@ type releaseIn struct {
 type flushIn struct {
 	Fh         uint64
 	FlushFlags uint32
-	_          uint32
+	Padding    uint32
 	LockOwner  uint64
 }
 
@@ -563,7 +555,7 @@ type readIn struct {
 	ReadFlags uint32
 	LockOwner uint64
 	Flags     uint32
-	_         uint32
+	padding   uint32
 }
 
 func readInSize(p Protocol) uintptr {
@@ -598,7 +590,7 @@ type writeIn struct {
 	WriteFlags uint32
 	LockOwner  uint64
 	Flags      uint32
-	_          uint32
+	padding    uint32
 }
 
 func writeInSize(p Protocol) uintptr {
@@ -611,8 +603,8 @@ func writeInSize(p Protocol) uintptr {
 }
 
 type writeOut struct {
-	Size uint32
-	_    uint32
+	Size    uint32
+	Padding uint32
 }
 
 // The WriteFlags are passed in WriteRequest.
@@ -642,7 +634,7 @@ type statfsOut struct {
 type fsyncIn struct {
 	Fh         uint64
 	FsyncFlags uint32
-	_          uint32
+	Padding    uint32
 }
 
 type setxattrInCommon struct {
@@ -655,8 +647,8 @@ func (setxattrInCommon) position() uint32 {
 }
 
 type getxattrInCommon struct {
-	Size uint32
-	_    uint32
+	Size    uint32
+	Padding uint32
 }
 
 func (getxattrInCommon) position() uint32 {
@@ -664,8 +656,8 @@ func (getxattrInCommon) position() uint32 {
 }
 
 type getxattrOut struct {
-	Size uint32
-	_    uint32
+	Size    uint32
+	Padding uint32
 }
 
 type lkIn struct {
@@ -673,7 +665,7 @@ type lkIn struct {
 	Owner   uint64
 	Lk      fileLock
 	LkFlags uint32
-	_       uint32
+	padding uint32
 }
 
 func lkInSize(p Protocol) uintptr {
@@ -690,8 +682,8 @@ type lkOut struct {
 }
 
 type accessIn struct {
-	Mask uint32
-	_    uint32
+	Mask    uint32
+	Padding uint32
 }
 
 type initIn struct {
@@ -719,7 +711,7 @@ type interruptIn struct {
 type bmapIn struct {
 	Block     uint64
 	BlockSize uint32
-	_         uint32
+	Padding   uint32
 }
 
 type bmapOut struct {
@@ -727,14 +719,14 @@ type bmapOut struct {
 }
 
 type inHeader struct {
-	Len    uint32
-	Opcode uint32
-	Unique uint64
-	Nodeid uint64
-	Uid    uint32
-	Gid    uint32
-	Pid    uint32
-	_      uint32
+	Len     uint32
+	Opcode  uint32
+	Unique  uint64
+	Nodeid  uint64
+	Uid     uint32
+	Gid     uint32
+	Pid     uint32
+	Padding uint32
 }
 
 const inHeaderSize = int(unsafe.Sizeof(inHeader{}))
@@ -770,5 +762,5 @@ type notifyInvalInodeOut struct {
 type notifyInvalEntryOut struct {
 	Parent  uint64
 	Namelen uint32
-	_       uint32
+	padding uint32
 }

Godeps/_workspace/src/bazil.org/fuse/fuse_kernel_test.go

@@ -0,0 +1,31 @@
+package fuse_test
+
+import (
+	"os"
+	"testing"
+
+	"bazil.org/fuse"
+)
+
+func TestOpenFlagsAccmodeMask(t *testing.T) {
+	var f = fuse.OpenFlags(os.O_RDWR | os.O_SYNC)
+	if g, e := f&fuse.OpenAccessModeMask, fuse.OpenReadWrite; g != e {
+		t.Fatalf("OpenAccessModeMask behaves wrong: %v: %o != %o", f, g, e)
+	}
+	if f.IsReadOnly() {
+		t.Fatalf("IsReadOnly is wrong: %v", f)
+	}
+	if f.IsWriteOnly() {
+		t.Fatalf("IsWriteOnly is wrong: %v", f)
+	}
+	if !f.IsReadWrite() {
+		t.Fatalf("IsReadWrite is wrong: %v", f)
+	}
+}
+
+func TestOpenFlagsString(t *testing.T) {
+	var f = fuse.OpenFlags(os.O_RDWR | os.O_SYNC | os.O_APPEND)
+	if g, e := f.String(), "OpenReadWrite+OpenAppend+OpenSync"; g != e {
+		t.Fatalf("OpenFlags.String: %q != %q", g, e)
+	}
+}

Godeps/_workspace/src/bazil.org/fuse/fuseutil/fuseutil.go

@@ -1,4 +1,4 @@
-package fuseutil // import "bazil.org/fuse/fuseutil"
+package fuseutil
 
 import (
 	"bazil.org/fuse"

Godeps/_workspace/src/bazil.org/fuse/mount_darwin.go

@@ -0,0 +1,126 @@
+package fuse
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"os"
+	"os/exec"
+	"strconv"
+	"strings"
+	"syscall"
+)
+
+var errNoAvail = errors.New("no available fuse devices")
+
+var errNotLoaded = errors.New("osxfusefs is not loaded")
+
+func loadOSXFUSE() error {
+	cmd := exec.Command("/Library/Filesystems/osxfusefs.fs/Support/load_osxfusefs")
+	cmd.Dir = "/"
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	err := cmd.Run()
+	return err
+}
+
+func openOSXFUSEDev() (*os.File, error) {
+	var f *os.File
+	var err error
+	for i := uint64(0); ; i++ {
+		path := "/dev/osxfuse" + strconv.FormatUint(i, 10)
+		f, err = os.OpenFile(path, os.O_RDWR, 0000)
+		if os.IsNotExist(err) {
+			if i == 0 {
+				// not even the first device was found -> fuse is not loaded
+				return nil, errNotLoaded
+			}
+
+			// we've run out of kernel-provided devices
+			return nil, errNoAvail
+		}
+
+		if err2, ok := err.(*os.PathError); ok && err2.Err == syscall.EBUSY {
+			// try the next one
+			continue
+		}
+
+		if err != nil {
+			return nil, err
+		}
+		return f, nil
+	}
+}
+
+func callMount(dir string, conf *mountConfig, f *os.File, ready chan<- struct{}, errp *error) error {
+	bin := "/Library/Filesystems/osxfusefs.fs/Support/mount_osxfusefs"
+
+	for k, v := range conf.options {
+		if strings.Contains(k, ",") || strings.Contains(v, ",") {
+			// Silly limitation but the mount helper does not
+			// understand any escaping. See TestMountOptionCommaError.
+			return fmt.Errorf("mount options cannot contain commas on darwin: %q=%q", k, v)
+		}
+	}
+	cmd := exec.Command(
+		bin,
+		"-o", conf.getOptions(),
+		// Tell osxfuse-kext how large our buffer is. It must split
+		// writes larger than this into multiple writes.
+		//
+		// OSXFUSE seems to ignore InitResponse.MaxWrite, and uses
+		// this instead.
+		"-o", "iosize="+strconv.FormatUint(maxWrite, 10),
+		// refers to fd passed in cmd.ExtraFiles
+		"3",
+		dir,
+	)
+	cmd.ExtraFiles = []*os.File{f}
+	cmd.Env = os.Environ()
+	cmd.Env = append(cmd.Env, "MOUNT_FUSEFS_CALL_BY_LIB=")
+	// TODO this is used for fs typenames etc, let app influence it
+	cmd.Env = append(cmd.Env, "MOUNT_FUSEFS_DAEMON_PATH="+bin)
+	var buf bytes.Buffer
+	cmd.Stdout = &buf
+	cmd.Stderr = &buf
+
+	err := cmd.Start()
+	if err != nil {
+		return err
+	}
+	go func() {
+		err := cmd.Wait()
+		if err != nil {
+			if buf.Len() > 0 {
+				output := buf.Bytes()
+				output = bytes.TrimRight(output, "\n")
+				msg := err.Error() + ": " + string(output)
+				err = errors.New(msg)
+			}
+		}
+		*errp = err
+		close(ready)
+	}()
+	return err
+}
+
+func mount(dir string, conf *mountConfig, ready chan<- struct{}, errp *error) (*os.File, error) {
+	f, err := openOSXFUSEDev()
+	if err == errNotLoaded {
+		err = loadOSXFUSE()
+		if err != nil {
+			return nil, err
+		}
+		// try again
+		f, err = openOSXFUSEDev()
+	}
+	if err != nil {
+		return nil, err
+	}
+	err = callMount(dir, conf, f, ready, errp)
+	if err != nil {
+		f.Close()
+		return nil, err
+	}
+	return f, nil
+}

Godeps/_workspace/src/bazil.org/fuse/mount_freebsd.go

@@ -0,0 +1,41 @@
+package fuse
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+)
+
+func mount(dir string, conf *mountConfig, ready chan<- struct{}, errp *error) (*os.File, error) {
+	for k, v := range conf.options {
+		if strings.Contains(k, ",") || strings.Contains(v, ",") {
+			// Silly limitation but the mount helper does not
+			// understand any escaping. See TestMountOptionCommaError.
+			return nil, fmt.Errorf("mount options cannot contain commas on FreeBSD: %q=%q", k, v)
+		}
+	}
+
+	f, err := os.OpenFile("/dev/fuse", os.O_RDWR, 0000)
+	if err != nil {
+		*errp = err
+		return nil, err
+	}
+
+	cmd := exec.Command(
+		"/sbin/mount_fusefs",
+		"--safe",
+		"-o", conf.getOptions(),
+		"3",
+		dir,
+	)
+	cmd.ExtraFiles = []*os.File{f}
+
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		return nil, fmt.Errorf("mount_fusefs: %q, %v", out, err)
+	}
+
+	close(ready)
+	return f, nil
+}

Godeps/_workspace/src/bazil.org/fuse/mount_linux.go

@@ -1,58 +1,35 @@
 package fuse
 
 import (
+	"bufio"
 	"fmt"
+	"io"
 	"log"
 	"net"
 	"os"
 	"os/exec"
-	"strings"
 	"sync"
 	"syscall"
 )
 
-func handleFusermountStderr(errCh chan<- error) func(line string) (ignore bool) {
-	return func(line string) (ignore bool) {
-		if line == `fusermount: failed to open /etc/fuse.conf: Permission denied` {
+func lineLogger(wg *sync.WaitGroup, prefix string, r io.ReadCloser) {
+	defer wg.Done()
+
+	scanner := bufio.NewScanner(r)
+	for scanner.Scan() {
+		switch line := scanner.Text(); line {
+		case `fusermount: failed to open /etc/fuse.conf: Permission denied`:
 			// Silence this particular message, it occurs way too
 			// commonly and isn't very relevant to whether the mount
 			// succeeds or not.
-			return true
-		}
-
-		const (
-			noMountpointPrefix = `fusermount: failed to access mountpoint `
-			noMountpointSuffix = `: No such file or directory`
-		)
-		if strings.HasPrefix(line, noMountpointPrefix) && strings.HasSuffix(line, noMountpointSuffix) {
-			// re-extract it from the error message in case some layer
-			// changed the path
-			mountpoint := line[len(noMountpointPrefix) : len(line)-len(noMountpointSuffix)]
-			err := &MountpointDoesNotExistError{
-				Path: mountpoint,
-			}
-			select {
-			case errCh <- err:
-				return true
-			default:
-				// not the first error; fall back to logging it
-				return false
-			}
-		}
-
-		return false
-	}
-}
-
-// isBoringFusermountError returns whether the Wait error is
-// uninteresting; exit status 1 is.
-func isBoringFusermountError(err error) bool {
-	if err, ok := err.(*exec.ExitError); ok && err.Exited() {
-		if status, ok := err.Sys().(syscall.WaitStatus); ok && status.ExitStatus() == 1 {
-			return true
+			continue
+		default:
+			log.Printf("%s: %s", prefix, line)
 		}
 	}
-	return false
+	if err := scanner.Err(); err != nil {
+		log.Printf("%s, error reading: %v", prefix, err)
+	}
 }
 
 func mount(dir string, conf *mountConfig, ready chan<- struct{}, errp *error) (fusefd *os.File, err error) {
@@ -93,26 +70,11 @@ func mount(dir string, conf *mountConfig, ready chan<- struct{}, errp *error) (f
 	if err := cmd.Start(); err != nil {
 		return nil, fmt.Errorf("fusermount: %v", err)
 	}
-	helperErrCh := make(chan error, 1)
 	wg.Add(2)
-	go lineLogger(&wg, "mount helper output", neverIgnoreLine, stdout)
-	go lineLogger(&wg, "mount helper error", handleFusermountStderr(helperErrCh), stderr)
+	go lineLogger(&wg, "mount helper output", stdout)
+	go lineLogger(&wg, "mount helper error", stderr)
 	wg.Wait()
 	if err := cmd.Wait(); err != nil {
-		// see if we have a better error to report
-		select {
-		case helperErr := <-helperErrCh:
-			// log the Wait error if it's not what we expected
-			if !isBoringFusermountError(err) {
-				log.Printf("mount helper failed: %v", err)
-			}
-			// and now return what we grabbed from stderr as the real
-			// error
-			return nil, helperErr
-		default:
-			// nope, fall back to generic message
-		}
-
 		return nil, fmt.Errorf("fusermount: %v", err)
 	}
 

Godeps/_workspace/src/bazil.org/fuse/options.go

@@ -0,0 +1,170 @@
+package fuse
+
+import (
+	"errors"
+	"strings"
+)
+
+func dummyOption(conf *mountConfig) error {
+	return nil
+}
+
+// mountConfig holds the configuration for a mount operation.
+// Use it by passing MountOption values to Mount.
+type mountConfig struct {
+	options      map[string]string
+	maxReadahead uint32
+	initFlags    InitFlags
+}
+
+func escapeComma(s string) string {
+	s = strings.Replace(s, `\`, `\\`, -1)
+	s = strings.Replace(s, `,`, `\,`, -1)
+	return s
+}
+
+// getOptions makes a string of options suitable for passing to FUSE
+// mount flag `-o`. Returns an empty string if no options were set.
+// Any platform specific adjustments should happen before the call.
+func (m *mountConfig) getOptions() string {
+	var opts []string
+	for k, v := range m.options {
+		k = escapeComma(k)
+		if v != "" {
+			k += "=" + escapeComma(v)
+		}
+		opts = append(opts, k)
+	}
+	return strings.Join(opts, ",")
+}
+
+type mountOption func(*mountConfig) error
+
+// MountOption is passed to Mount to change the behavior of the mount.
+type MountOption mountOption
+
+// FSName sets the file system name (also called source) that is
+// visible in the list of mounted file systems.
+//
+// FreeBSD ignores this option.
+func FSName(name string) MountOption {
+	return func(conf *mountConfig) error {
+		conf.options["fsname"] = name
+		return nil
+	}
+}
+
+// Subtype sets the subtype of the mount. The main type is always
+// `fuse`. The type in a list of mounted file systems will look like
+// `fuse.foo`.
+//
+// OS X ignores this option.
+// FreeBSD ignores this option.
+func Subtype(fstype string) MountOption {
+	return func(conf *mountConfig) error {
+		conf.options["subtype"] = fstype
+		return nil
+	}
+}
+
+// LocalVolume sets the volume to be local (instead of network),
+// changing the behavior of Finder, Spotlight, and such.
+//
+// OS X only. Others ignore this option.
+func LocalVolume() MountOption {
+	return localVolume
+}
+
+// VolumeName sets the volume name shown in Finder.
+//
+// OS X only. Others ignore this option.
+func VolumeName(name string) MountOption {
+	return volumeName(name)
+}
+
+var ErrCannotCombineAllowOtherAndAllowRoot = errors.New("cannot combine AllowOther and AllowRoot")
+
+// AllowOther allows other users to access the file system.
+//
+// Only one of AllowOther or AllowRoot can be used.
+func AllowOther() MountOption {
+	return func(conf *mountConfig) error {
+		if _, ok := conf.options["allow_root"]; ok {
+			return ErrCannotCombineAllowOtherAndAllowRoot
+		}
+		conf.options["allow_other"] = ""
+		return nil
+	}
+}
+
+// AllowRoot allows other users to access the file system.
+//
+// Only one of AllowOther or AllowRoot can be used.
+//
+// FreeBSD ignores this option.
+func AllowRoot() MountOption {
+	return func(conf *mountConfig) error {
+		if _, ok := conf.options["allow_other"]; ok {
+			return ErrCannotCombineAllowOtherAndAllowRoot
+		}
+		conf.options["allow_root"] = ""
+		return nil
+	}
+}
+
+// DefaultPermissions makes the kernel enforce access control based on
+// the file mode (as in chmod).
+//
+// Without this option, the Node itself decides what is and is not
+// allowed. This is normally ok because FUSE file systems cannot be
+// accessed by other users without AllowOther/AllowRoot.
+//
+// FreeBSD ignores this option.
+func DefaultPermissions() MountOption {
+	return func(conf *mountConfig) error {
+		conf.options["default_permissions"] = ""
+		return nil
+	}
+}
+
+// ReadOnly makes the mount read-only.
+func ReadOnly() MountOption {
+	return func(conf *mountConfig) error {
+		conf.options["ro"] = ""
+		return nil
+	}
+}
+
+// MaxReadahead sets the number of bytes that can be prefetched for
+// sequential reads. The kernel can enforce a maximum value lower than
+// this.
+//
+// This setting makes the kernel perform speculative reads that do not
+// originate from any client process. This usually tremendously
+// improves read performance.
+func MaxReadahead(n uint32) MountOption {
+	return func(conf *mountConfig) error {
+		conf.maxReadahead = n
+		return nil
+	}
+}
+
+// AsyncRead enables multiple outstanding read requests for the same
+// handle. Without this, there is at most one request in flight at a
+// time.
+func AsyncRead() MountOption {
+	return func(conf *mountConfig) error {
+		conf.initFlags |= InitAsyncRead
+		return nil
+	}
+}
+
+// WritebackCache enables the kernel to buffer writes before sending
+// them to the FUSE server. Without this, writethrough caching is
+// used.
+func WritebackCache() MountOption {
+	return func(conf *mountConfig) error {
+		conf.initFlags |= InitWritebackCache
+		return nil
+	}
+}

Godeps/_workspace/src/bazil.org/fuse/options_darwin.go

@@ -0,0 +1,13 @@
+package fuse
+
+func localVolume(conf *mountConfig) error {
+	conf.options["local"] = ""
+	return nil
+}
+
+func volumeName(name string) MountOption {
+	return func(conf *mountConfig) error {
+		conf.options["volname"] = name
+		return nil
+	}
+}

Godeps/_workspace/src/bazil.org/fuse/options_freebsd.go

@@ -0,0 +1,9 @@
+package fuse
+
+func localVolume(conf *mountConfig) error {
+	return nil
+}
+
+func volumeName(name string) MountOption {
+	return dummyOption
+}

Godeps/_workspace/src/bazil.org/fuse/options_helper_test.go

@@ -0,0 +1,10 @@
+package fuse
+
+// for TestMountOptionCommaError
+func ForTestSetMountOption(k, v string) MountOption {
+	fn := func(conf *mountConfig) error {
+		conf.options[k] = v
+		return nil
+	}
+	return fn
+}

Godeps/_workspace/src/bazil.org/fuse/options_linux.go

@@ -0,0 +1,9 @@
+package fuse
+
+func localVolume(conf *mountConfig) error {
+	return nil
+}
+
+func volumeName(name string) MountOption {
+	return dummyOption
+}

Godeps/_workspace/src/bazil.org/fuse/options_nocomma_test.go

@@ -0,0 +1,31 @@
+// This file contains tests for platforms that have no escape
+// mechanism for including commas in mount options.
+//
+// +build darwin
+
+package fuse_test
+
+import (
+	"runtime"
+	"testing"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs/fstestutil"
+)
+
+func TestMountOptionCommaError(t *testing.T) {
+	t.Parallel()
+	// this test is not tied to any specific option, it just needs
+	// some string content
+	var evil = "FuseTest,Marker"
+	mnt, err := fstestutil.MountedT(t, fstestutil.SimpleFS{fstestutil.Dir{}}, nil,
+		fuse.ForTestSetMountOption("fusetest", evil),
+	)
+	if err == nil {
+		mnt.Close()
+		t.Fatal("expected an error about commas")
+	}
+	if g, e := err.Error(), `mount options cannot contain commas on `+runtime.GOOS+`: "fusetest"="FuseTest,Marker"`; g != e {
+		t.Fatalf("wrong error: %q != %q", g, e)
+	}
+}

Godeps/_workspace/src/bazil.org/fuse/options_test.go

@@ -0,0 +1,231 @@
+package fuse_test
+
+import (
+	"os"
+	"runtime"
+	"syscall"
+	"testing"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	"bazil.org/fuse/fs/fstestutil"
+	"golang.org/x/net/context"
+)
+
+func init() {
+	fstestutil.DebugByDefault()
+}
+
+func TestMountOptionFSName(t *testing.T) {
+	if runtime.GOOS == "freebsd" {
+		t.Skip("FreeBSD does not support FSName")
+	}
+	t.Parallel()
+	const name = "FuseTestMarker"
+	mnt, err := fstestutil.MountedT(t, fstestutil.SimpleFS{fstestutil.Dir{}}, nil,
+		fuse.FSName(name),
+	)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer mnt.Close()
+
+	info, err := fstestutil.GetMountInfo(mnt.Dir)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if g, e := info.FSName, name; g != e {
+		t.Errorf("wrong FSName: %q != %q", g, e)
+	}
+}
+
+func testMountOptionFSNameEvil(t *testing.T, evil string) {
+	if runtime.GOOS == "freebsd" {
+		t.Skip("FreeBSD does not support FSName")
+	}
+	t.Parallel()
+	var name = "FuseTest" + evil + "Marker"
+	mnt, err := fstestutil.MountedT(t, fstestutil.SimpleFS{fstestutil.Dir{}}, nil,
+		fuse.FSName(name),
+	)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer mnt.Close()
+
+	info, err := fstestutil.GetMountInfo(mnt.Dir)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if g, e := info.FSName, name; g != e {
+		t.Errorf("wrong FSName: %q != %q", g, e)
+	}
+}
+
+func TestMountOptionFSNameEvilComma(t *testing.T) {
+	if runtime.GOOS == "darwin" {
+		// see TestMountOptionCommaError for a test that enforces we
+		// at least give a nice error, instead of corrupting the mount
+		// options
+		t.Skip("TODO: OS X gets this wrong, commas in mount options cannot be escaped at all")
+	}
+	testMountOptionFSNameEvil(t, ",")
+}
+
+func TestMountOptionFSNameEvilSpace(t *testing.T) {
+	testMountOptionFSNameEvil(t, " ")
+}
+
+func TestMountOptionFSNameEvilTab(t *testing.T) {
+	testMountOptionFSNameEvil(t, "\t")
+}
+
+func TestMountOptionFSNameEvilNewline(t *testing.T) {
+	testMountOptionFSNameEvil(t, "\n")
+}
+
+func TestMountOptionFSNameEvilBackslash(t *testing.T) {
+	testMountOptionFSNameEvil(t, `\`)
+}
+
+func TestMountOptionFSNameEvilBackslashDouble(t *testing.T) {
+	// catch double-unescaping, if it were to happen
+	testMountOptionFSNameEvil(t, `\\`)
+}
+
+func TestMountOptionSubtype(t *testing.T) {
+	if runtime.GOOS == "darwin" {
+		t.Skip("OS X does not support Subtype")
+	}
+	if runtime.GOOS == "freebsd" {
+		t.Skip("FreeBSD does not support Subtype")
+	}
+	t.Parallel()
+	const name = "FuseTestMarker"
+	mnt, err := fstestutil.MountedT(t, fstestutil.SimpleFS{fstestutil.Dir{}}, nil,
+		fuse.Subtype(name),
+	)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer mnt.Close()
+
+	info, err := fstestutil.GetMountInfo(mnt.Dir)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if g, e := info.Type, "fuse."+name; g != e {
+		t.Errorf("wrong Subtype: %q != %q", g, e)
+	}
+}
+
+// TODO test LocalVolume
+
+// TODO test AllowOther; hard because needs system-level authorization
+
+func TestMountOptionAllowOtherThenAllowRoot(t *testing.T) {
+	t.Parallel()
+	mnt, err := fstestutil.MountedT(t, fstestutil.SimpleFS{fstestutil.Dir{}}, nil,
+		fuse.AllowOther(),
+		fuse.AllowRoot(),
+	)
+	if err == nil {
+		mnt.Close()
+	}
+	if g, e := err, fuse.ErrCannotCombineAllowOtherAndAllowRoot; g != e {
+		t.Fatalf("wrong error: %v != %v", g, e)
+	}
+}
+
+// TODO test AllowRoot; hard because needs system-level authorization
+
+func TestMountOptionAllowRootThenAllowOther(t *testing.T) {
+	t.Parallel()
+	mnt, err := fstestutil.MountedT(t, fstestutil.SimpleFS{fstestutil.Dir{}}, nil,
+		fuse.AllowRoot(),
+		fuse.AllowOther(),
+	)
+	if err == nil {
+		mnt.Close()
+	}
+	if g, e := err, fuse.ErrCannotCombineAllowOtherAndAllowRoot; g != e {
+		t.Fatalf("wrong error: %v != %v", g, e)
+	}
+}
+
+type unwritableFile struct{}
+
+func (f unwritableFile) Attr(ctx context.Context, a *fuse.Attr) error {
+	a.Mode = 0000
+	return nil
+}
+
+func TestMountOptionDefaultPermissions(t *testing.T) {
+	if runtime.GOOS == "freebsd" {
+		t.Skip("FreeBSD does not support DefaultPermissions")
+	}
+	t.Parallel()
+	mnt, err := fstestutil.MountedT(t,
+		fstestutil.SimpleFS{
+			&fstestutil.ChildMap{"child": unwritableFile{}},
+		},
+		nil,
+		fuse.DefaultPermissions(),
+	)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer mnt.Close()
+
+	// This will be prevented by kernel-level access checking when
+	// DefaultPermissions is used.
+	f, err := os.OpenFile(mnt.Dir+"/child", os.O_WRONLY, 0000)
+	if err == nil {
+		f.Close()
+		t.Fatal("expected an error")
+	}
+	if !os.IsPermission(err) {
+		t.Fatalf("expected a permission error, got %T: %v", err, err)
+	}
+}
+
+type createrDir struct {
+	fstestutil.Dir
+}
+
+var _ fs.NodeCreater = createrDir{}
+
+func (createrDir) Create(ctx context.Context, req *fuse.CreateRequest, resp *fuse.CreateResponse) (fs.Node, fs.Handle, error) {
+	// pick a really distinct error, to identify it later
+	return nil, nil, fuse.Errno(syscall.ENAMETOOLONG)
+}
+
+func TestMountOptionReadOnly(t *testing.T) {
+	t.Parallel()
+	mnt, err := fstestutil.MountedT(t,
+		fstestutil.SimpleFS{createrDir{}},
+		nil,
+		fuse.ReadOnly(),
+	)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer mnt.Close()
+
+	// This will be prevented by kernel-level access checking when
+	// ReadOnly is used.
+	f, err := os.Create(mnt.Dir + "/child")
+	if err == nil {
+		f.Close()
+		t.Fatal("expected an error")
+	}
+	perr, ok := err.(*os.PathError)
+	if !ok {
+		t.Fatalf("expected PathError, got %T: %v", err, err)
+	}
+	if perr.Err != syscall.EROFS {
+		t.Fatalf("expected EROFS, got %T: %v", err, err)
+	}
+}

Godeps/_workspace/src/bazil.org/fuse/syscallx/doc.go

@@ -0,0 +1,13 @@
+// Package syscallx provides wrappers that make syscalls on various
+// platforms more interoperable.
+//
+// The API intentionally omits the OS X-specific position and option
+// arguments for extended attribute calls.
+//
+// Not having position means it might not be useful for accessing the
+// resource fork. If that's needed by code inside fuse, a function
+// with a different name may be added on the side.
+//
+// Options can be implemented with separate wrappers, in the style of
+// Linux getxattr/lgetxattr/fgetxattr.
+package syscallx

Godeps/_workspace/src/bazil.org/fuse/syscallx/generate

@@ -0,0 +1,34 @@
+#!/bin/sh
+set -e
+
+mksys="$(go env GOROOT)/src/pkg/syscall/mksyscall.pl"
+
+fix() {
+    sed 's,^package syscall$,&x\nimport "syscall",' \
+	| gofmt -r='BytePtrFromString -> syscall.BytePtrFromString' \
+	| gofmt -r='Syscall6 -> syscall.Syscall6' \
+	| gofmt -r='Syscall -> syscall.Syscall' \
+	| gofmt -r='SYS_GETXATTR -> syscall.SYS_GETXATTR' \
+	| gofmt -r='SYS_LISTXATTR -> syscall.SYS_LISTXATTR' \
+	| gofmt -r='SYS_SETXATTR -> syscall.SYS_SETXATTR' \
+	| gofmt -r='SYS_REMOVEXATTR -> syscall.SYS_REMOVEXATTR' \
+	| gofmt -r='SYS_MSYNC -> syscall.SYS_MSYNC'
+}
+
+cd "$(dirname "$0")"
+
+$mksys xattr_darwin.go \
+    | fix \
+    >xattr_darwin_amd64.go
+
+$mksys -l32 xattr_darwin.go \
+    | fix \
+    >xattr_darwin_386.go
+
+$mksys msync.go \
+    | fix \
+    >msync_amd64.go
+
+$mksys -l32 msync.go \
+    | fix \
+    >msync_386.go

Godeps/_workspace/src/bazil.org/fuse/syscallx/msync.go

@@ -0,0 +1,9 @@
+package syscallx
+
+/* This is the source file for msync_*.go, to regenerate run
+
+   ./generate
+
+*/
+
+//sys Msync(b []byte, flags int) (err error)

Godeps/_workspace/src/bazil.org/fuse/syscallx/msync_386.go

@@ -0,0 +1,24 @@
+// mksyscall.pl -l32 msync.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+package syscallx
+
+import "syscall"
+
+import "unsafe"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := syscall.Syscall(syscall.SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}

Godeps/_workspace/src/bazil.org/fuse/syscallx/msync_amd64.go

@@ -0,0 +1,24 @@
+// mksyscall.pl msync.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+package syscallx
+
+import "syscall"
+
+import "unsafe"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := syscall.Syscall(syscall.SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}

Godeps/_workspace/src/bazil.org/fuse/syscallx/syscallx.go

@@ -0,0 +1,4 @@
+package syscallx
+
+// make us look more like package syscall, so mksyscall.pl output works
+var _zero uintptr

Godeps/_workspace/src/bazil.org/fuse/syscallx/syscallx_std.go

@@ -0,0 +1,26 @@
+// +build !darwin
+
+package syscallx
+
+// This file just contains wrappers for platforms that already have
+// the right stuff in golang.org/x/sys/unix.
+
+import (
+	"golang.org/x/sys/unix"
+)
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	return unix.Getxattr(path, attr, dest)
+}
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	return unix.Listxattr(path, dest)
+}
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	return unix.Setxattr(path, attr, data, flags)
+}
+
+func Removexattr(path string, attr string) (err error) {
+	return unix.Removexattr(path, attr)
+}

Godeps/_workspace/src/bazil.org/fuse/syscallx/xattr_darwin.go

@@ -0,0 +1,38 @@
+package syscallx
+
+/* This is the source file for syscallx_darwin_*.go, to regenerate run
+
+   ./generate
+
+*/
+
+// cannot use dest []byte here because OS X getxattr really wants a
+// NULL to trigger size probing, size==0 is not enough
+//
+//sys getxattr(path string, attr string, dest *byte, size int, position uint32, options int) (sz int, err error)
+
+func Getxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var destp *byte
+	if len(dest) > 0 {
+		destp = &dest[0]
+	}
+	return getxattr(path, attr, destp, len(dest), 0, 0)
+}
+
+//sys listxattr(path string, dest []byte, options int) (sz int, err error)
+
+func Listxattr(path string, dest []byte) (sz int, err error) {
+	return listxattr(path, dest, 0)
+}
+
+//sys setxattr(path string, attr string, data []byte, position uint32, flags int) (err error)
+
+func Setxattr(path string, attr string, data []byte, flags int) (err error) {
+	return setxattr(path, attr, data, 0, flags)
+}
+
+//sys removexattr(path string, attr string, options int) (err error)
+
+func Removexattr(path string, attr string) (err error) {
+	return removexattr(path, attr, 0)
+}

Godeps/_workspace/src/bazil.org/fuse/syscallx/xattr_darwin_386.go

@@ -0,0 +1,97 @@
+// mksyscall.pl -l32 xattr_darwin.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+package syscallx
+
+import "syscall"
+
+import "unsafe"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getxattr(path string, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = syscall.BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := syscall.Syscall6(syscall.SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func listxattr(path string, dest []byte, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall.Syscall6(syscall.SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setxattr(path string, attr string, data []byte, position uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = syscall.BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := syscall.Syscall6(syscall.SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(position), uintptr(flags))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func removexattr(path string, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = syscall.BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := syscall.Syscall(syscall.SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}

Godeps/_workspace/src/bazil.org/fuse/syscallx/xattr_darwin_amd64.go

@@ -0,0 +1,97 @@
+// mksyscall.pl xattr_darwin.go
+// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+
+package syscallx
+
+import "syscall"
+
+import "unsafe"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getxattr(path string, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = syscall.BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := syscall.Syscall6(syscall.SYS_GETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func listxattr(path string, dest []byte, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall.Syscall6(syscall.SYS_LISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setxattr(path string, attr string, data []byte, position uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = syscall.BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := syscall.Syscall6(syscall.SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(position), uintptr(flags))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func removexattr(path string, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = syscall.BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = syscall.BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := syscall.Syscall(syscall.SYS_REMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(options))
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}

Godeps/_workspace/src/github.com/jessevdk/go-flags/.travis.yml

@@ -0,0 +1,35 @@
+language: go
+
+install:
+  # go-flags
+  - go get -d -v ./...
+  - go build -v ./...
+
+  # linting
+  - go get golang.org/x/tools/cmd/vet
+  - go get github.com/golang/lint
+  - go install github.com/golang/lint/golint
+
+  # code coverage
+  - go get golang.org/x/tools/cmd/cover
+  - go get github.com/onsi/ginkgo/ginkgo
+  - go get github.com/modocache/gover
+  - if [ "$TRAVIS_SECURE_ENV_VARS" = "true" ]; then go get github.com/mattn/goveralls; fi
+
+script:
+  # go-flags
+  - $(exit $(gofmt -l . | wc -l))
+  - go test -v ./...
+
+  # linting
+  - go tool vet -all=true -v=true . || true
+  - $(go env GOPATH | awk 'BEGIN{FS=":"} {print $1}')/bin/golint ./...
+
+  # code coverage
+  - $(go env GOPATH | awk 'BEGIN{FS=":"} {print $1}')/bin/ginkgo -r -cover
+  - $(go env GOPATH | awk 'BEGIN{FS=":"} {print $1}')/bin/gover
+  - if [ "$TRAVIS_SECURE_ENV_VARS" = "true" ]; then $(go env GOPATH | awk 'BEGIN{FS=":"} {print $1}')/bin/goveralls -coverprofile=gover.coverprofile -service=travis-ci -repotoken $COVERALLS_TOKEN; fi
+
+env:
+  # coveralls.io
+  secure: "RCYbiB4P0RjQRIoUx/vG/AjP3mmYCbzOmr86DCww1Z88yNcy3hYr3Cq8rpPtYU5v0g7wTpu4adaKIcqRE9xknYGbqj3YWZiCoBP1/n4Z+9sHW3Dsd9D/GRGeHUus0laJUGARjWoCTvoEtOgTdGQDoX7mH+pUUY0FBltNYUdOiiU="

Godeps/_workspace/src/github.com/jessevdk/go-flags/LICENSE

@@ -1,18 +1,17 @@
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
+Copyright (c) 2012 Jesse van den Kieboom. All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+     notice, this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
+     copyright notice, this list of conditions and the following disclaimer
+     in the documentation and/or other materials provided with the
+     distribution.
    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+     contributors may be used to endorse or promote products derived from
+     this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

Godeps/_workspace/src/github.com/jessevdk/go-flags/README.md

@@ -0,0 +1,131 @@
+go-flags: a go library for parsing command line arguments
+=========================================================
+
+[![GoDoc](https://godoc.org/github.com/jessevdk/go-flags?status.png)](https://godoc.org/github.com/jessevdk/go-flags) [![Build Status](https://travis-ci.org/jessevdk/go-flags.svg?branch=master)](https://travis-ci.org/jessevdk/go-flags) [![Coverage Status](https://img.shields.io/coveralls/jessevdk/go-flags.svg)](https://coveralls.io/r/jessevdk/go-flags?branch=master)
+
+This library provides similar functionality to the builtin flag library of
+go, but provides much more functionality and nicer formatting. From the
+documentation:
+
+Package flags provides an extensive command line option parser.
+The flags package is similar in functionality to the go builtin flag package
+but provides more options and uses reflection to provide a convenient and
+succinct way of specifying command line options.
+
+Supported features:
+* Options with short names (-v)
+* Options with long names (--verbose)
+* Options with and without arguments (bool v.s. other type)
+* Options with optional arguments and default values
+* Multiple option groups each containing a set of options
+* Generate and print well-formatted help message
+* Passing remaining command line arguments after -- (optional)
+* Ignoring unknown command line options (optional)
+* Supports -I/usr/include -I=/usr/include -I /usr/include option argument specification
+* Supports multiple short options -aux
+* Supports all primitive go types (string, int{8..64}, uint{8..64}, float)
+* Supports same option multiple times (can store in slice or last option counts)
+* Supports maps
+* Supports function callbacks
+* Supports namespaces for (nested) option groups
+
+The flags package uses structs, reflection and struct field tags
+to allow users to specify command line options. This results in very simple
+and concise specification of your application options. For example:
+
+    type Options struct {
+        Verbose []bool `short:"v" long:"verbose" description:"Show verbose debug information"`
+    }
+
+This specifies one option with a short name -v and a long name --verbose.
+When either -v or --verbose is found on the command line, a 'true' value
+will be appended to the Verbose field. e.g. when specifying -vvv, the
+resulting value of Verbose will be {[true, true, true]}.
+
+Example:
+--------
+	var opts struct {
+		// Slice of bool will append 'true' each time the option
+		// is encountered (can be set multiple times, like -vvv)
+		Verbose []bool `short:"v" long:"verbose" description:"Show verbose debug information"`
+
+		// Example of automatic marshalling to desired type (uint)
+		Offset uint `long:"offset" description:"Offset"`
+
+		// Example of a callback, called each time the option is found.
+		Call func(string) `short:"c" description:"Call phone number"`
+
+		// Example of a required flag
+		Name string `short:"n" long:"name" description:"A name" required:"true"`
+
+		// Example of a value name
+		File string `short:"f" long:"file" description:"A file" value-name:"FILE"`
+
+		// Example of a pointer
+		Ptr *int `short:"p" description:"A pointer to an integer"`
+
+		// Example of a slice of strings
+		StringSlice []string `short:"s" description:"A slice of strings"`
+
+		// Example of a slice of pointers
+		PtrSlice []*string `long:"ptrslice" description:"A slice of pointers to string"`
+
+		// Example of a map
+		IntMap map[string]int `long:"intmap" description:"A map from string to int"`
+	}
+
+	// Callback which will invoke callto:<argument> to call a number.
+	// Note that this works just on OS X (and probably only with
+	// Skype) but it shows the idea.
+	opts.Call = func(num string) {
+		cmd := exec.Command("open", "callto:"+num)
+		cmd.Start()
+		cmd.Process.Release()
+	}
+
+	// Make some fake arguments to parse.
+	args := []string{
+		"-vv",
+		"--offset=5",
+		"-n", "Me",
+		"-p", "3",
+		"-s", "hello",
+		"-s", "world",
+		"--ptrslice", "hello",
+		"--ptrslice", "world",
+		"--intmap", "a:1",
+		"--intmap", "b:5",
+		"arg1",
+		"arg2",
+		"arg3",
+	}
+
+	// Parse flags from `args'. Note that here we use flags.ParseArgs for
+	// the sake of making a working example. Normally, you would simply use
+	// flags.Parse(&opts) which uses os.Args
+	args, err := flags.ParseArgs(&opts, args)
+
+	if err != nil {
+		panic(err)
+		os.Exit(1)
+	}
+
+	fmt.Printf("Verbosity: %v\n", opts.Verbose)
+	fmt.Printf("Offset: %d\n", opts.Offset)
+	fmt.Printf("Name: %s\n", opts.Name)
+	fmt.Printf("Ptr: %d\n", *opts.Ptr)
+	fmt.Printf("StringSlice: %v\n", opts.StringSlice)
+	fmt.Printf("PtrSlice: [%v %v]\n", *opts.PtrSlice[0], *opts.PtrSlice[1])
+	fmt.Printf("IntMap: [a:%v b:%v]\n", opts.IntMap["a"], opts.IntMap["b"])
+	fmt.Printf("Remaining args: %s\n", strings.Join(args, " "))
+
+	// Output: Verbosity: [true true]
+	// Offset: 5
+	// Name: Me
+	// Ptr: 3
+	// StringSlice: [hello world]
+	// PtrSlice: [hello world]
+	// IntMap: [a:1 b:5]
+	// Remaining args: arg1 arg2 arg3
+
+More information can be found in the godocs: <http://godoc.org/github.com/jessevdk/go-flags>

Godeps/_workspace/src/github.com/jessevdk/go-flags/arg.go

@@ -0,0 +1,21 @@
+package flags
+
+import (
+	"reflect"
+)
+
+// Arg represents a positional argument on the command line.
+type Arg struct {
+	// The name of the positional argument (used in the help)
+	Name string
+
+	// A description of the positional argument (used in the help)
+	Description string
+
+	value reflect.Value
+	tag   multiTag
+}
+
+func (a *Arg) isRemaining() bool {
+	return a.value.Type().Kind() == reflect.Slice
+}

Godeps/_workspace/src/github.com/jessevdk/go-flags/arg_test.go

@@ -0,0 +1,53 @@
+package flags
+
+import (
+	"testing"
+)
+
+func TestPositional(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Positional struct {
+			Command  int
+			Filename string
+			Rest     []string
+		} `positional-args:"yes" required:"yes"`
+	}{}
+
+	p := NewParser(&opts, Default)
+	ret, err := p.ParseArgs([]string{"10", "arg_test.go", "a", "b"})
+
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+		return
+	}
+
+	if opts.Positional.Command != 10 {
+		t.Fatalf("Expected opts.Positional.Command to be 10, but got %v", opts.Positional.Command)
+	}
+
+	if opts.Positional.Filename != "arg_test.go" {
+		t.Fatalf("Expected opts.Positional.Filename to be \"arg_test.go\", but got %v", opts.Positional.Filename)
+	}
+
+	assertStringArray(t, opts.Positional.Rest, []string{"a", "b"})
+	assertStringArray(t, ret, []string{})
+}
+
+func TestPositionalRequired(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Positional struct {
+			Command  int
+			Filename string
+			Rest     []string
+		} `positional-args:"yes" required:"yes"`
+	}{}
+
+	p := NewParser(&opts, None)
+	_, err := p.ParseArgs([]string{"10"})
+
+	assertError(t, err, ErrRequired, "the required argument `Filename` was not provided")
+}

Godeps/_workspace/src/github.com/jessevdk/go-flags/assert_test.go

@@ -0,0 +1,177 @@
+package flags
+
+import (
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path"
+	"runtime"
+	"testing"
+)
+
+func assertCallerInfo() (string, int) {
+	ptr := make([]uintptr, 15)
+	n := runtime.Callers(1, ptr)
+
+	if n == 0 {
+		return "", 0
+	}
+
+	mef := runtime.FuncForPC(ptr[0])
+	mefile, meline := mef.FileLine(ptr[0])
+
+	for i := 2; i < n; i++ {
+		f := runtime.FuncForPC(ptr[i])
+		file, line := f.FileLine(ptr[i])
+
+		if file != mefile {
+			return file, line
+		}
+	}
+
+	return mefile, meline
+}
+
+func assertErrorf(t *testing.T, format string, args ...interface{}) {
+	msg := fmt.Sprintf(format, args...)
+
+	file, line := assertCallerInfo()
+
+	t.Errorf("%s:%d: %s", path.Base(file), line, msg)
+}
+
+func assertFatalf(t *testing.T, format string, args ...interface{}) {
+	msg := fmt.Sprintf(format, args...)
+
+	file, line := assertCallerInfo()
+
+	t.Fatalf("%s:%d: %s", path.Base(file), line, msg)
+}
+
+func assertString(t *testing.T, a string, b string) {
+	if a != b {
+		assertErrorf(t, "Expected %#v, but got %#v", b, a)
+	}
+}
+
+func assertStringArray(t *testing.T, a []string, b []string) {
+	if len(a) != len(b) {
+		assertErrorf(t, "Expected %#v, but got %#v", b, a)
+		return
+	}
+
+	for i, v := range a {
+		if b[i] != v {
+			assertErrorf(t, "Expected %#v, but got %#v", b, a)
+			return
+		}
+	}
+}
+
+func assertBoolArray(t *testing.T, a []bool, b []bool) {
+	if len(a) != len(b) {
+		assertErrorf(t, "Expected %#v, but got %#v", b, a)
+		return
+	}
+
+	for i, v := range a {
+		if b[i] != v {
+			assertErrorf(t, "Expected %#v, but got %#v", b, a)
+			return
+		}
+	}
+}
+
+func assertParserSuccess(t *testing.T, data interface{}, args ...string) (*Parser, []string) {
+	parser := NewParser(data, Default&^PrintErrors)
+	ret, err := parser.ParseArgs(args)
+
+	if err != nil {
+		t.Fatalf("Unexpected parse error: %s", err)
+		return nil, nil
+	}
+
+	return parser, ret
+}
+
+func assertParseSuccess(t *testing.T, data interface{}, args ...string) []string {
+	_, ret := assertParserSuccess(t, data, args...)
+	return ret
+}
+
+func assertError(t *testing.T, err error, typ ErrorType, msg string) {
+	if err == nil {
+		assertFatalf(t, "Expected error: %s", msg)
+		return
+	}
+
+	if e, ok := err.(*Error); !ok {
+		assertFatalf(t, "Expected Error type, but got %#v", err)
+	} else {
+		if e.Type != typ {
+			assertErrorf(t, "Expected error type {%s}, but got {%s}", typ, e.Type)
+		}
+
+		if e.Message != msg {
+			assertErrorf(t, "Expected error message %#v, but got %#v", msg, e.Message)
+		}
+	}
+}
+
+func assertParseFail(t *testing.T, typ ErrorType, msg string, data interface{}, args ...string) []string {
+	parser := NewParser(data, Default&^PrintErrors)
+	ret, err := parser.ParseArgs(args)
+
+	assertError(t, err, typ, msg)
+	return ret
+}
+
+func diff(a, b string) (string, error) {
+	atmp, err := ioutil.TempFile("", "help-diff")
+
+	if err != nil {
+		return "", err
+	}
+
+	btmp, err := ioutil.TempFile("", "help-diff")
+
+	if err != nil {
+		return "", err
+	}
+
+	if _, err := io.WriteString(atmp, a); err != nil {
+		return "", err
+	}
+
+	if _, err := io.WriteString(btmp, b); err != nil {
+		return "", err
+	}
+
+	ret, err := exec.Command("diff", "-u", "-d", "--label", "got", atmp.Name(), "--label", "expected", btmp.Name()).Output()
+
+	os.Remove(atmp.Name())
+	os.Remove(btmp.Name())
+
+	if err.Error() == "exit status 1" {
+		return string(ret), nil
+	}
+
+	return string(ret), err
+}
+
+func assertDiff(t *testing.T, actual, expected, msg string) {
+	if actual == expected {
+		return
+	}
+
+	ret, err := diff(actual, expected)
+
+	if err != nil {
+		assertErrorf(t, "Unexpected diff error: %s", err)
+		assertErrorf(t, "Unexpected %s, expected:\n\n%s\n\nbut got\n\n%s", msg, expected, actual)
+	} else {
+		assertErrorf(t, "Unexpected %s:\n\n%s", msg, ret)
+	}
+}

Godeps/_workspace/src/github.com/jessevdk/go-flags/check_crosscompile.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+echo '# linux arm7'
+GOARM=7 GOARCH=arm GOOS=linux go build
+echo '# linux arm5'
+GOARM=5 GOARCH=arm GOOS=linux go build
+echo '# windows 386'
+GOARCH=386 GOOS=windows go build
+echo '# windows amd64'
+GOARCH=amd64 GOOS=windows go build
+echo '# darwin'
+GOARCH=amd64 GOOS=darwin go build
+echo '# freebsd'
+GOARCH=amd64 GOOS=freebsd go build

Godeps/_workspace/src/github.com/jessevdk/go-flags/closest.go

@@ -0,0 +1,59 @@
+package flags
+
+func levenshtein(s string, t string) int {
+	if len(s) == 0 {
+		return len(t)
+	}
+
+	if len(t) == 0 {
+		return len(s)
+	}
+
+	dists := make([][]int, len(s)+1)
+	for i := range dists {
+		dists[i] = make([]int, len(t)+1)
+		dists[i][0] = i
+	}
+
+	for j := range t {
+		dists[0][j] = j
+	}
+
+	for i, sc := range s {
+		for j, tc := range t {
+			if sc == tc {
+				dists[i+1][j+1] = dists[i][j]
+			} else {
+				dists[i+1][j+1] = dists[i][j] + 1
+				if dists[i+1][j] < dists[i+1][j+1] {
+					dists[i+1][j+1] = dists[i+1][j] + 1
+				}
+				if dists[i][j+1] < dists[i+1][j+1] {
+					dists[i+1][j+1] = dists[i][j+1] + 1
+				}
+			}
+		}
+	}
+
+	return dists[len(s)][len(t)]
+}
+
+func closestChoice(cmd string, choices []string) (string, int) {
+	if len(choices) == 0 {
+		return "", 0
+	}
+
+	mincmd := -1
+	mindist := -1
+
+	for i, c := range choices {
+		l := levenshtein(cmd, c)
+
+		if mincmd < 0 || l < mindist {
+			mindist = l
+			mincmd = i
+		}
+	}
+
+	return choices[mincmd], mindist
+}

Godeps/_workspace/src/github.com/jessevdk/go-flags/command.go

@@ -0,0 +1,106 @@
+package flags
+
+// Command represents an application command. Commands can be added to the
+// parser (which itself is a command) and are selected/executed when its name
+// is specified on the command line. The Command type embeds a Group and
+// therefore also carries a set of command specific options.
+type Command struct {
+	// Embedded, see Group for more information
+	*Group
+
+	// The name by which the command can be invoked
+	Name string
+
+	// The active sub command (set by parsing) or nil
+	Active *Command
+
+	// Whether subcommands are optional
+	SubcommandsOptional bool
+
+	// Aliases for the command
+	Aliases []string
+
+	// Whether positional arguments are required
+	ArgsRequired bool
+
+	commands            []*Command
+	hasBuiltinHelpGroup bool
+	args                []*Arg
+}
+
+// Commander is an interface which can be implemented by any command added in
+// the options. When implemented, the Execute method will be called for the last
+// specified (sub)command providing the remaining command line arguments.
+type Commander interface {
+	// Execute will be called for the last active (sub)command. The
+	// args argument contains the remaining command line arguments. The
+	// error that Execute returns will be eventually passed out of the
+	// Parse method of the Parser.
+	Execute(args []string) error
+}
+
+// Usage is an interface which can be implemented to show a custom usage string
+// in the help message shown for a command.
+type Usage interface {
+	// Usage is called for commands to allow customized printing of command
+	// usage in the generated help message.
+	Usage() string
+}
+
+// AddCommand adds a new command to the parser with the given name and data. The
+// data needs to be a pointer to a struct from which the fields indicate which
+// options are in the command. The provided data can implement the Command and
+// Usage interfaces.
+func (c *Command) AddCommand(command string, shortDescription string, longDescription string, data interface{}) (*Command, error) {
+	cmd := newCommand(command, shortDescription, longDescription, data)
+
+	cmd.parent = c
+
+	if err := cmd.scan(); err != nil {
+		return nil, err
+	}
+
+	c.commands = append(c.commands, cmd)
+	return cmd, nil
+}
+
+// AddGroup adds a new group to the command with the given name and data. The
+// data needs to be a pointer to a struct from which the fields indicate which
+// options are in the group.
+func (c *Command) AddGroup(shortDescription string, longDescription string, data interface{}) (*Group, error) {
+	group := newGroup(shortDescription, longDescription, data)
+
+	group.parent = c
+
+	if err := group.scanType(c.scanSubcommandHandler(group)); err != nil {
+		return nil, err
+	}
+
+	c.groups = append(c.groups, group)
+	return group, nil
+}
+
+// Commands returns a list of subcommands of this command.
+func (c *Command) Commands() []*Command {
+	return c.commands
+}
+
+// Find locates the subcommand with the given name and returns it. If no such
+// command can be found Find will return nil.
+func (c *Command) Find(name string) *Command {
+	for _, cc := range c.commands {
+		if cc.match(name) {
+			return cc
+		}
+	}
+
+	return nil
+}
+
+// Args returns a list of positional arguments associated with this command.
+func (c *Command) Args() []*Arg {
+	ret := make([]*Arg, len(c.args))
+	copy(ret, c.args)
+
+	return ret
+}

Godeps/_workspace/src/github.com/jessevdk/go-flags/command_private.go

@@ -0,0 +1,271 @@
+package flags
+
+import (
+	"reflect"
+	"sort"
+	"strings"
+	"unsafe"
+)
+
+type lookup struct {
+	shortNames map[string]*Option
+	longNames  map[string]*Option
+
+	commands map[string]*Command
+}
+
+func newCommand(name string, shortDescription string, longDescription string, data interface{}) *Command {
+	return &Command{
+		Group: newGroup(shortDescription, longDescription, data),
+		Name:  name,
+	}
+}
+
+func (c *Command) scanSubcommandHandler(parentg *Group) scanHandler {
+	f := func(realval reflect.Value, sfield *reflect.StructField) (bool, error) {
+		mtag := newMultiTag(string(sfield.Tag))
+
+		if err := mtag.Parse(); err != nil {
+			return true, err
+		}
+
+		positional := mtag.Get("positional-args")
+
+		if len(positional) != 0 {
+			stype := realval.Type()
+
+			for i := 0; i < stype.NumField(); i++ {
+				field := stype.Field(i)
+
+				m := newMultiTag((string(field.Tag)))
+
+				if err := m.Parse(); err != nil {
+					return true, err
+				}
+
+				name := m.Get("positional-arg-name")
+
+				if len(name) == 0 {
+					name = field.Name
+				}
+
+				arg := &Arg{
+					Name:        name,
+					Description: m.Get("description"),
+
+					value: realval.Field(i),
+					tag:   m,
+				}
+
+				c.args = append(c.args, arg)
+
+				if len(mtag.Get("required")) != 0 {
+					c.ArgsRequired = true
+				}
+			}
+
+			return true, nil
+		}
+
+		subcommand := mtag.Get("command")
+
+		if len(subcommand) != 0 {
+			ptrval := reflect.NewAt(realval.Type(), unsafe.Pointer(realval.UnsafeAddr()))
+
+			shortDescription := mtag.Get("description")
+			longDescription := mtag.Get("long-description")
+			subcommandsOptional := mtag.Get("subcommands-optional")
+			aliases := mtag.GetMany("alias")
+
+			subc, err := c.AddCommand(subcommand, shortDescription, longDescription, ptrval.Interface())
+
+			if err != nil {
+				return true, err
+			}
+
+			if len(subcommandsOptional) > 0 {
+				subc.SubcommandsOptional = true
+			}
+
+			if len(aliases) > 0 {
+				subc.Aliases = aliases
+			}
+
+			return true, nil
+		}
+
+		return parentg.scanSubGroupHandler(realval, sfield)
+	}
+
+	return f
+}
+
+func (c *Command) scan() error {
+	return c.scanType(c.scanSubcommandHandler(c.Group))
+}
+
+func (c *Command) eachCommand(f func(*Command), recurse bool) {
+	f(c)
+
+	for _, cc := range c.commands {
+		if recurse {
+			cc.eachCommand(f, true)
+		} else {
+			f(cc)
+		}
+	}
+}
+
+func (c *Command) eachActiveGroup(f func(cc *Command, g *Group)) {
+	c.eachGroup(func(g *Group) {
+		f(c, g)
+	})
+
+	if c.Active != nil {
+		c.Active.eachActiveGroup(f)
+	}
+}
+
+func (c *Command) addHelpGroups(showHelp func() error) {
+	if !c.hasBuiltinHelpGroup {
+		c.addHelpGroup(showHelp)
+		c.hasBuiltinHelpGroup = true
+	}
+
+	for _, cc := range c.commands {
+		cc.addHelpGroups(showHelp)
+	}
+}
+
+func (c *Command) makeLookup() lookup {
+	ret := lookup{
+		shortNames: make(map[string]*Option),
+		longNames:  make(map[string]*Option),
+		commands:   make(map[string]*Command),
+	}
+
+	parent := c.parent
+
+	for parent != nil {
+		if cmd, ok := parent.(*Command); ok {
+			cmd.fillLookup(&ret, true)
+		}
+
+		if grp, ok := parent.(*Group); ok {
+			parent = grp
+		} else {
+			parent = nil
+		}
+	}
+
+	c.fillLookup(&ret, false)
+	return ret
+}
+
+func (c *Command) fillLookup(ret *lookup, onlyOptions bool) {
+	c.eachGroup(func(g *Group) {
+		for _, option := range g.options {
+			if option.ShortName != 0 {
+				ret.shortNames[string(option.ShortName)] = option
+			}
+
+			if len(option.LongName) > 0 {
+				ret.longNames[option.LongNameWithNamespace()] = option
+			}
+		}
+	})
+
+	if onlyOptions {
+		return
+	}
+
+	for _, subcommand := range c.commands {
+		ret.commands[subcommand.Name] = subcommand
+
+		for _, a := range subcommand.Aliases {
+			ret.commands[a] = subcommand
+		}
+	}
+}
+
+func (c *Command) groupByName(name string) *Group {
+	if grp := c.Group.groupByName(name); grp != nil {
+		return grp
+	}
+
+	for _, subc := range c.commands {
+		prefix := subc.Name + "."
+
+		if strings.HasPrefix(name, prefix) {
+			if grp := subc.groupByName(name[len(prefix):]); grp != nil {
+				return grp
+			}
+		} else if name == subc.Name {
+			return subc.Group
+		}
+	}
+
+	return nil
+}
+
+type commandList []*Command
+
+func (c commandList) Less(i, j int) bool {
+	return c[i].Name < c[j].Name
+}
+
+func (c commandList) Len() int {
+	return len(c)
+}
+
+func (c commandList) Swap(i, j int) {
+	c[i], c[j] = c[j], c[i]
+}
+
+func (c *Command) sortedCommands() []*Command {
+	ret := make(commandList, len(c.commands))
+	copy(ret, c.commands)
+
+	sort.Sort(ret)
+	return []*Command(ret)
+}
+
+func (c *Command) match(name string) bool {
+	if c.Name == name {
+		return true
+	}
+
+	for _, v := range c.Aliases {
+		if v == name {
+			return true
+		}
+	}
+
+	return false
+}
+
+func (c *Command) hasCliOptions() bool {
+	ret := false
+
+	c.eachGroup(func(g *Group) {
+		if g.isBuiltinHelp {
+			return
+		}
+
+		for _, opt := range g.options {
+			if opt.canCli() {
+				ret = true
+			}
+		}
+	})
+
+	return ret
+}
+
+func (c *Command) fillParseState(s *parseState) {
+	s.positional = make([]*Arg, len(c.args))
+	copy(s.positional, c.args)
+
+	s.lookup = c.makeLookup()
+	s.command = c
+}

Godeps/_workspace/src/github.com/jessevdk/go-flags/command_test.go

@@ -0,0 +1,402 @@
+package flags
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestCommandInline(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Command struct {
+			G bool `short:"g"`
+		} `command:"cmd"`
+	}{}
+
+	p, ret := assertParserSuccess(t, &opts, "-v", "cmd", "-g")
+
+	assertStringArray(t, ret, []string{})
+
+	if p.Active == nil {
+		t.Errorf("Expected active command")
+	}
+
+	if !opts.Value {
+		t.Errorf("Expected Value to be true")
+	}
+
+	if !opts.Command.G {
+		t.Errorf("Expected Command.G to be true")
+	}
+
+	if p.Command.Find("cmd") != p.Active {
+		t.Errorf("Expected to find command `cmd' to be active")
+	}
+}
+
+func TestCommandInlineMulti(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		C1 struct {
+		} `command:"c1"`
+
+		C2 struct {
+			G bool `short:"g"`
+		} `command:"c2"`
+	}{}
+
+	p, ret := assertParserSuccess(t, &opts, "-v", "c2", "-g")
+
+	assertStringArray(t, ret, []string{})
+
+	if p.Active == nil {
+		t.Errorf("Expected active command")
+	}
+
+	if !opts.Value {
+		t.Errorf("Expected Value to be true")
+	}
+
+	if !opts.C2.G {
+		t.Errorf("Expected C2.G to be true")
+	}
+
+	if p.Command.Find("c1") == nil {
+		t.Errorf("Expected to find command `c1'")
+	}
+
+	if c2 := p.Command.Find("c2"); c2 == nil {
+		t.Errorf("Expected to find command `c2'")
+	} else if c2 != p.Active {
+		t.Errorf("Expected to find command `c2' to be active")
+	}
+}
+
+func TestCommandFlagOrder1(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Command struct {
+			G bool `short:"g"`
+		} `command:"cmd"`
+	}{}
+
+	assertParseFail(t, ErrUnknownFlag, "unknown flag `g'", &opts, "-v", "-g", "cmd")
+}
+
+func TestCommandFlagOrder2(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Command struct {
+			G bool `short:"g"`
+		} `command:"cmd"`
+	}{}
+
+	assertParseSuccess(t, &opts, "cmd", "-v", "-g")
+
+	if !opts.Value {
+		t.Errorf("Expected Value to be true")
+	}
+
+	if !opts.Command.G {
+		t.Errorf("Expected Command.G to be true")
+	}
+}
+
+func TestCommandFlagOverride1(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Command struct {
+			Value bool `short:"v"`
+		} `command:"cmd"`
+	}{}
+
+	assertParseSuccess(t, &opts, "-v", "cmd")
+
+	if !opts.Value {
+		t.Errorf("Expected Value to be true")
+	}
+
+	if opts.Command.Value {
+		t.Errorf("Expected Command.Value to be false")
+	}
+}
+
+func TestCommandFlagOverride2(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Command struct {
+			Value bool `short:"v"`
+		} `command:"cmd"`
+	}{}
+
+	assertParseSuccess(t, &opts, "cmd", "-v")
+
+	if opts.Value {
+		t.Errorf("Expected Value to be false")
+	}
+
+	if !opts.Command.Value {
+		t.Errorf("Expected Command.Value to be true")
+	}
+}
+
+func TestCommandEstimate(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Cmd1 struct {
+		} `command:"remove"`
+
+		Cmd2 struct {
+		} `command:"add"`
+	}{}
+
+	p := NewParser(&opts, None)
+	_, err := p.ParseArgs([]string{})
+
+	assertError(t, err, ErrCommandRequired, "Please specify one command of: add or remove")
+}
+
+func TestCommandEstimate2(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Cmd1 struct {
+		} `command:"remove"`
+
+		Cmd2 struct {
+		} `command:"add"`
+	}{}
+
+	p := NewParser(&opts, None)
+	_, err := p.ParseArgs([]string{"rmive"})
+
+	assertError(t, err, ErrUnknownCommand, "Unknown command `rmive', did you mean `remove'?")
+}
+
+type testCommand struct {
+	G        bool `short:"g"`
+	Executed bool
+	EArgs    []string
+}
+
+func (c *testCommand) Execute(args []string) error {
+	c.Executed = true
+	c.EArgs = args
+
+	return nil
+}
+
+func TestCommandExecute(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Command testCommand `command:"cmd"`
+	}{}
+
+	assertParseSuccess(t, &opts, "-v", "cmd", "-g", "a", "b")
+
+	if !opts.Value {
+		t.Errorf("Expected Value to be true")
+	}
+
+	if !opts.Command.Executed {
+		t.Errorf("Did not execute command")
+	}
+
+	if !opts.Command.G {
+		t.Errorf("Expected Command.C to be true")
+	}
+
+	assertStringArray(t, opts.Command.EArgs, []string{"a", "b"})
+}
+
+func TestCommandClosest(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Cmd1 struct {
+		} `command:"remove"`
+
+		Cmd2 struct {
+		} `command:"add"`
+	}{}
+
+	args := assertParseFail(t, ErrUnknownCommand, "Unknown command `addd', did you mean `add'?", &opts, "-v", "addd")
+
+	assertStringArray(t, args, []string{"addd"})
+}
+
+func TestCommandAdd(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+	}{}
+
+	var cmd = struct {
+		G bool `short:"g"`
+	}{}
+
+	p := NewParser(&opts, Default)
+	c, err := p.AddCommand("cmd", "", "", &cmd)
+
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+		return
+	}
+
+	ret, err := p.ParseArgs([]string{"-v", "cmd", "-g", "rest"})
+
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+		return
+	}
+
+	assertStringArray(t, ret, []string{"rest"})
+
+	if !opts.Value {
+		t.Errorf("Expected Value to be true")
+	}
+
+	if !cmd.G {
+		t.Errorf("Expected Command.G to be true")
+	}
+
+	if p.Command.Find("cmd") != c {
+		t.Errorf("Expected to find command `cmd'")
+	}
+
+	if p.Commands()[0] != c {
+		t.Errorf("Expected command %#v, but got %#v", c, p.Commands()[0])
+	}
+
+	if c.Options()[0].ShortName != 'g' {
+		t.Errorf("Expected short name `g' but got %v", c.Options()[0].ShortName)
+	}
+}
+
+func TestCommandNestedInline(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Command struct {
+			G bool `short:"g"`
+
+			Nested struct {
+				N string `long:"n"`
+			} `command:"nested"`
+		} `command:"cmd"`
+	}{}
+
+	p, ret := assertParserSuccess(t, &opts, "-v", "cmd", "-g", "nested", "--n", "n", "rest")
+
+	assertStringArray(t, ret, []string{"rest"})
+
+	if !opts.Value {
+		t.Errorf("Expected Value to be true")
+	}
+
+	if !opts.Command.G {
+		t.Errorf("Expected Command.G to be true")
+	}
+
+	assertString(t, opts.Command.Nested.N, "n")
+
+	if c := p.Command.Find("cmd"); c == nil {
+		t.Errorf("Expected to find command `cmd'")
+	} else {
+		if c != p.Active {
+			t.Errorf("Expected `cmd' to be the active parser command")
+		}
+
+		if nested := c.Find("nested"); nested == nil {
+			t.Errorf("Expected to find command `nested'")
+		} else if nested != c.Active {
+			t.Errorf("Expected to find command `nested' to be the active `cmd' command")
+		}
+	}
+}
+
+func TestRequiredOnCommand(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v" required:"true"`
+
+		Command struct {
+			G bool `short:"g"`
+		} `command:"cmd"`
+	}{}
+
+	assertParseFail(t, ErrRequired, fmt.Sprintf("the required flag `%cv' was not specified", defaultShortOptDelimiter), &opts, "cmd")
+}
+
+func TestRequiredAllOnCommand(t *testing.T) {
+	var opts = struct {
+		Value   bool `short:"v" required:"true"`
+		Missing bool `long:"missing" required:"true"`
+
+		Command struct {
+			G bool `short:"g"`
+		} `command:"cmd"`
+	}{}
+
+	assertParseFail(t, ErrRequired, fmt.Sprintf("the required flags `%smissing' and `%cv' were not specified", defaultLongOptDelimiter, defaultShortOptDelimiter), &opts, "cmd")
+}
+
+func TestDefaultOnCommand(t *testing.T) {
+	var opts = struct {
+		Command struct {
+			G bool `short:"g" default:"true"`
+		} `command:"cmd"`
+	}{}
+
+	assertParseSuccess(t, &opts, "cmd")
+
+	if !opts.Command.G {
+		t.Errorf("Expected G to be true")
+	}
+}
+
+func TestSubcommandsOptional(t *testing.T) {
+	var opts = struct {
+		Value bool `short:"v"`
+
+		Cmd1 struct {
+		} `command:"remove"`
+
+		Cmd2 struct {
+		} `command:"add"`
+	}{}
+
+	p := NewParser(&opts, None)
+	p.SubcommandsOptional = true
+
+	_, err := p.ParseArgs([]string{"-v"})
+
+	if err != nil {
+		t.Fatalf("Unexpected error: %v", err)
+		return
+	}
+
+	if !opts.Value {
+		t.Errorf("Expected Value to be true")
+	}
+}
+
+func TestCommandAlias(t *testing.T) {
+	var opts = struct {
+		Command struct {
+			G bool `short:"g" default:"true"`
+		} `command:"cmd" alias:"cm"`
+	}{}
+
+	assertParseSuccess(t, &opts, "cm")
+
+	if !opts.Command.G {
+		t.Errorf("Expected G to be true")
+	}
+}

Godeps/_workspace/src/github.com/jessevdk/go-flags/completion.go

@@ -0,0 +1,304 @@
+package flags
+
+import (
+	"fmt"
+	"path/filepath"
+	"reflect"
+	"sort"
+	"strings"
+	"unicode/utf8"
+)
+
+// Completion is a type containing information of a completion.
+type Completion struct {
+	// The completed item
+	Item string
+
+	// A description of the completed item (optional)
+	Description string
+}
+
+type completions []Completion
+
+func (c completions) Len() int {
+	return len(c)
+}
+
+func (c completions) Less(i, j int) bool {
+	return c[i].Item < c[j].Item
+}
+
+func (c completions) Swap(i, j int) {
+	c[i], c[j] = c[j], c[i]
+}
+
+// Completer is an interface which can be implemented by types
+// to provide custom command line argument completion.
+type Completer interface {
+	// Complete receives a prefix representing a (partial) value
+	// for its type and should provide a list of possible valid
+	// completions.
+	Complete(match string) []Completion
+}
+
+type completion struct {
+	parser *Parser
+
+	ShowDescriptions bool
+}
+
+// Filename is a string alias which provides filename completion.
+type Filename string
+
+func completionsWithoutDescriptions(items []string) []Completion {
+	ret := make([]Completion, len(items))
+
+	for i, v := range items {
+		ret[i].Item = v
+	}
+
+	return ret
+}
+
+// Complete returns a list of existing files with the given
+// prefix.
+func (f *Filename) Complete(match string) []Completion {
+	ret, _ := filepath.Glob(match + "*")
+	return completionsWithoutDescriptions(ret)
+}
+
+func (c *completion) skipPositional(s *parseState, n int) {
+	if n >= len(s.positional) {
+		s.positional = nil
+	} else {
+		s.positional = s.positional[n:]
+	}
+}
+
+func (c *completion) completeOptionNames(names map[string]*Option, prefix string, match string) []Completion {
+	n := make([]Completion, 0, len(names))
+
+	for k, opt := range names {
+		if strings.HasPrefix(k, match) {
+			n = append(n, Completion{
+				Item:        prefix + k,
+				Description: opt.Description,
+			})
+		}
+	}
+
+	return n
+}
+
+func (c *completion) completeLongNames(s *parseState, prefix string, match string) []Completion {
+	return c.completeOptionNames(s.lookup.longNames, prefix, match)
+}
+
+func (c *completion) completeShortNames(s *parseState, prefix string, match string) []Completion {
+	if len(match) != 0 {
+		return []Completion{
+			Completion{
+				Item: prefix + match,
+			},
+		}
+	}
+
+	return c.completeOptionNames(s.lookup.shortNames, prefix, match)
+}
+
+func (c *completion) completeCommands(s *parseState, match string) []Completion {
+	n := make([]Completion, 0, len(s.command.commands))
+
+	for _, cmd := range s.command.commands {
+		if cmd.data != c && strings.HasPrefix(cmd.Name, match) {
+			n = append(n, Completion{
+				Item:        cmd.Name,
+				Description: cmd.ShortDescription,
+			})
+		}
+	}
+
+	return n
+}
+
+func (c *completion) completeValue(value reflect.Value, prefix string, match string) []Completion {
+	i := value.Interface()
+
+	var ret []Completion
+
+	if cmp, ok := i.(Completer); ok {
+		ret = cmp.Complete(match)
+	} else if value.CanAddr() {
+		if cmp, ok = value.Addr().Interface().(Completer); ok {
+			ret = cmp.Complete(match)
+		}
+	}
+
+	for i, v := range ret {
+		ret[i].Item = prefix + v.Item
+	}
+
+	return ret
+}
+
+func (c *completion) completeArg(arg *Arg, prefix string, match string) []Completion {
+	if arg.isRemaining() {
+		// For remaining positional args (that are parsed into a slice), complete
+		// based on the element type.
+		return c.completeValue(reflect.New(arg.value.Type().Elem()), prefix, match)
+	}
+
+	return c.completeValue(arg.value, prefix, match)
+}
+
+func (c *completion) complete(args []string) []Completion {
+	if len(args) == 0 {
+		args = []string{""}
+	}
+
+	s := &parseState{
+		args: args,
+	}
+
+	c.parser.fillParseState(s)
+
+	var opt *Option
+
+	for len(s.args) > 1 {
+		arg := s.pop()
+
+		if (c.parser.Options&PassDoubleDash) != None && arg == "--" {
+			opt = nil
+			c.skipPositional(s, len(s.args)-1)
+
+			break
+		}
+
+		if argumentIsOption(arg) {
+			prefix, optname, islong := stripOptionPrefix(arg)
+			optname, _, argument := splitOption(prefix, optname, islong)
+
+			if argument == nil {
+				var o *Option
+				canarg := true
+
+				if islong {
+					o = s.lookup.longNames[optname]
+				} else {
+					for i, r := range optname {
+						sname := string(r)
+						o = s.lookup.shortNames[sname]
+
+						if o == nil {
+							break
+						}
+
+						if i == 0 && o.canArgument() && len(optname) != len(sname) {
+							canarg = false
+							break
+						}
+					}
+				}
+
+				if o == nil && (c.parser.Options&PassAfterNonOption) != None {
+					opt = nil
+					c.skipPositional(s, len(s.args)-1)
+
+					break
+				} else if o != nil && o.canArgument() && !o.OptionalArgument && canarg {
+					if len(s.args) > 1 {
+						s.pop()
+					} else {
+						opt = o
+					}
+				}
+			}
+		} else {
+			if len(s.positional) > 0 {
+				if !s.positional[0].isRemaining() {
+					// Don't advance beyond a remaining positional arg (because
+					// it consumes all subsequent args).
+					s.positional = s.positional[1:]
+				}
+			} else if cmd, ok := s.lookup.commands[arg]; ok {
+				cmd.fillParseState(s)
+			}
+
+			opt = nil
+		}
+	}
+
+	lastarg := s.args[len(s.args)-1]
+	var ret []Completion
+
+	if opt != nil {
+		// Completion for the argument of 'opt'
+		ret = c.completeValue(opt.value, "", lastarg)
+	} else if argumentStartsOption(lastarg) {
+		// Complete the option
+		prefix, optname, islong := stripOptionPrefix(lastarg)
+		optname, split, argument := splitOption(prefix, optname, islong)
+
+		if argument == nil && !islong {
+			rname, n := utf8.DecodeRuneInString(optname)
+			sname := string(rname)
+
+			if opt := s.lookup.shortNames[sname]; opt != nil && opt.canArgument() {
+				ret = c.completeValue(opt.value, prefix+sname, optname[n:])
+			} else {
+				ret = c.completeShortNames(s, prefix, optname)
+			}
+		} else if argument != nil {
+			if islong {
+				opt = s.lookup.longNames[optname]
+			} else {
+				opt = s.lookup.shortNames[optname]
+			}
+
+			if opt != nil {
+				ret = c.completeValue(opt.value, prefix+optname+split, *argument)
+			}
+		} else if islong {
+			ret = c.completeLongNames(s, prefix, optname)
+		} else {
+			ret = c.completeShortNames(s, prefix, optname)
+		}
+	} else if len(s.positional) > 0 {
+		// Complete for positional argument
+		ret = c.completeArg(s.positional[0], "", lastarg)
+	} else if len(s.command.commands) > 0 {
+		// Complete for command
+		ret = c.completeCommands(s, lastarg)
+	}
+
+	sort.Sort(completions(ret))
+	return ret
+}
+
+func (c *completion) execute(args []string) {
+	ret := c.complete(args)
+
+	if c.ShowDescriptions && len(ret) > 1 {
+		maxl := 0
+
+		for _, v := range ret {
+			if len(v.Item) > maxl {
+				maxl = len(v.Item)
+			}
+		}
+
+		for _, v := range ret {
+			fmt.Printf("%s", v.Item)
+
+			if len(v.Description) > 0 {
+				fmt.Printf("%s  # %s", strings.Repeat(" ", maxl-len(v.Item)), v.Description)
+			}
+
+			fmt.Printf("\n")
+		}
+	} else {
+		for _, v := range ret {
+			fmt.Println(v.Item)
+		}
+	}
+}

Godeps/_workspace/src/github.com/jessevdk/go-flags/completion_test.go

@@ -0,0 +1,289 @@
+package flags
+
+import (
+	"bytes"
+	"io"
+	"os"
+	"path"
+	"path/filepath"
+	"reflect"
+	"runtime"
+	"strings"
+	"testing"
+)
+
+type TestComplete struct {
+}
+
+func (t *TestComplete) Complete(match string) []Completion {
+	options := []string{
+		"hello world",
+		"hello universe",
+		"hello multiverse",
+	}
+
+	ret := make([]Completion, 0, len(options))
+
+	for _, o := range options {
+		if strings.HasPrefix(o, match) {
+			ret = append(ret, Completion{
+				Item: o,
+			})
+		}
+	}
+
+	return ret
+}
+
+var completionTestOptions struct {
+	Verbose  bool `short:"v" long:"verbose" description:"Verbose messages"`
+	Debug    bool `short:"d" long:"debug" description:"Enable debug"`
+	Version  bool `long:"version" description:"Show version"`
+	Required bool `long:"required" required:"true" description:"This is required"`
+
+	AddCommand struct {
+		Positional struct {
+			Filename Filename
+		} `positional-args:"yes"`
+	} `command:"add" description:"add an item"`
+
+	AddMultiCommand struct {
+		Positional struct {
+			Filename []Filename
+		} `positional-args:"yes"`
+	} `command:"add-multi" description:"add multiple items"`
+
+	RemoveCommand struct {
+		Other bool     `short:"o"`
+		File  Filename `short:"f" long:"filename"`
+	} `command:"rm" description:"remove an item"`
+
+	RenameCommand struct {
+		Completed TestComplete `short:"c" long:"completed"`
+	} `command:"rename" description:"rename an item"`
+}
+
+type completionTest struct {
+	Args             []string
+	Completed        []string
+	ShowDescriptions bool
+}
+
+var completionTests []completionTest
+
+func init() {
+	_, sourcefile, _, _ := runtime.Caller(0)
+	completionTestSourcedir := filepath.Join(filepath.SplitList(path.Dir(sourcefile))...)
+
+	completionTestFilename := []string{filepath.Join(completionTestSourcedir, "completion.go"), filepath.Join(completionTestSourcedir, "completion_test.go")}
+
+	completionTests = []completionTest{
+		{
+			// Short names
+			[]string{"-"},
+			[]string{"-d", "-v"},
+			false,
+		},
+
+		{
+			// Short names concatenated
+			[]string{"-dv"},
+			[]string{"-dv"},
+			false,
+		},
+
+		{
+			// Long names
+			[]string{"--"},
+			[]string{"--debug", "--required", "--verbose", "--version"},
+			false,
+		},
+
+		{
+			// Long names with descriptions
+			[]string{"--"},
+			[]string{
+				"--debug     # Enable debug",
+				"--required  # This is required",
+				"--verbose   # Verbose messages",
+				"--version   # Show version",
+			},
+			true,
+		},
+
+		{
+			// Long names partial
+			[]string{"--ver"},
+			[]string{"--verbose", "--version"},
+			false,
+		},
+
+		{
+			// Commands
+			[]string{""},
+			[]string{"add", "add-multi", "rename", "rm"},
+			false,
+		},
+
+		{
+			// Commands with descriptions
+			[]string{""},
+			[]string{
+				"add        # add an item",
+				"add-multi  # add multiple items",
+				"rename     # rename an item",
+				"rm         # remove an item",
+			},
+			true,
+		},
+
+		{
+			// Commands partial
+			[]string{"r"},
+			[]string{"rename", "rm"},
+			false,
+		},
+
+		{
+			// Positional filename
+			[]string{"add", filepath.Join(completionTestSourcedir, "completion")},
+			completionTestFilename,
+			false,
+		},
+
+		{
+			// Multiple positional filename (1 arg)
+			[]string{"add-multi", filepath.Join(completionTestSourcedir, "completion")},
+			completionTestFilename,
+			false,
+		},
+		{
+			// Multiple positional filename (2 args)
+			[]string{"add-multi", filepath.Join(completionTestSourcedir, "completion.go"), filepath.Join(completionTestSourcedir, "completion")},
+			completionTestFilename,
+			false,
+		},
+		{
+			// Multiple positional filename (3 args)
+			[]string{"add-multi", filepath.Join(completionTestSourcedir, "completion.go"), filepath.Join(completionTestSourcedir, "completion.go"), filepath.Join(completionTestSourcedir, "completion")},
+			completionTestFilename,
+			false,
+		},
+
+		{
+			// Flag filename
+			[]string{"rm", "-f", path.Join(completionTestSourcedir, "completion")},
+			completionTestFilename,
+			false,
+		},
+
+		{
+			// Flag short concat last filename
+			[]string{"rm", "-of", path.Join(completionTestSourcedir, "completion")},
+			completionTestFilename,
+			false,
+		},
+
+		{
+			// Flag concat filename
+			[]string{"rm", "-f" + path.Join(completionTestSourcedir, "completion")},
+			[]string{"-f" + completionTestFilename[0], "-f" + completionTestFilename[1]},
+			false,
+		},
+
+		{
+			// Flag equal concat filename
+			[]string{"rm", "-f=" + path.Join(completionTestSourcedir, "completion")},
+			[]string{"-f=" + completionTestFilename[0], "-f=" + completionTestFilename[1]},
+			false,
+		},
+
+		{
+			// Flag concat long filename
+			[]string{"rm", "--filename=" + path.Join(completionTestSourcedir, "completion")},
+			[]string{"--filename=" + completionTestFilename[0], "--filename=" + completionTestFilename[1]},
+			false,
+		},
+
+		{
+			// Flag long filename
+			[]string{"rm", "--filename", path.Join(completionTestSourcedir, "completion")},
+			completionTestFilename,
+			false,
+		},
+
+		{
+			// Custom completed
+			[]string{"rename", "-c", "hello un"},
+			[]string{"hello universe"},
+			false,
+		},
+	}
+}
+
+func TestCompletion(t *testing.T) {
+	p := NewParser(&completionTestOptions, Default)
+	c := &completion{parser: p}
+
+	for _, test := range completionTests {
+		if test.ShowDescriptions {
+			continue
+		}
+
+		ret := c.complete(test.Args)
+		items := make([]string, len(ret))
+
+		for i, v := range ret {
+			items[i] = v.Item
+		}
+
+		if !reflect.DeepEqual(items, test.Completed) {
+			t.Errorf("Args: %#v, %#v\n  Expected: %#v\n  Got:     %#v", test.Args, test.ShowDescriptions, test.Completed, items)
+		}
+	}
+}
+
+func TestParserCompletion(t *testing.T) {
+	for _, test := range completionTests {
+		if test.ShowDescriptions {
+			os.Setenv("GO_FLAGS_COMPLETION", "verbose")
+		} else {
+			os.Setenv("GO_FLAGS_COMPLETION", "1")
+		}
+
+		tmp := os.Stdout
+
+		r, w, _ := os.Pipe()
+		os.Stdout = w
+
+		out := make(chan string)
+
+		go func() {
+			var buf bytes.Buffer
+
+			io.Copy(&buf, r)
+
+			out <- buf.String()
+		}()
+
+		p := NewParser(&completionTestOptions, None)
+
+		_, err := p.ParseArgs(test.Args)
+
+		w.Close()
+
+		os.Stdout = tmp
+
+		if err != nil {
+			t.Fatalf("Unexpected error: %s", err)
+		}
+
+		got := strings.Split(strings.Trim(<-out, "\n"), "\n")
+
+		if !reflect.DeepEqual(got, test.Completed) {
+			t.Errorf("Expected: %#v\nGot: %#v", test.Completed, got)
+		}
+	}
+
+	os.Setenv("GO_FLAGS_COMPLETION", "")
+}

Godeps/_workspace/src/github.com/jessevdk/go-flags/convert.go

@@ -0,0 +1,377 @@
+// Copyright 2012 Jesse van den Kieboom. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package flags
+
+import (
+	"fmt"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// Marshaler is the interface implemented by types that can marshal themselves
+// to a string representation of the flag.
+type Marshaler interface {
+	// MarshalFlag marshals a flag value to its string representation.
+	MarshalFlag() (string, error)
+}
+
+// Unmarshaler is the interface implemented by types that can unmarshal a flag
+// argument to themselves. The provided value is directly passed from the
+// command line.
+type Unmarshaler interface {
+	// UnmarshalFlag unmarshals a string value representation to the flag
+	// value (which therefore needs to be a pointer receiver).
+	UnmarshalFlag(value string) error
+}
+
+func getBase(options multiTag, base int) (int, error) {
+	sbase := options.Get("base")
+
+	var err error
+	var ivbase int64
+
+	if sbase != "" {
+		ivbase, err = strconv.ParseInt(sbase, 10, 32)
+		base = int(ivbase)
+	}
+
+	return base, err
+}
+
+func convertMarshal(val reflect.Value) (bool, string, error) {
+	// Check first for the Marshaler interface
+	if val.Type().NumMethod() > 0 && val.CanInterface() {
+		if marshaler, ok := val.Interface().(Marshaler); ok {
+			ret, err := marshaler.MarshalFlag()
+			return true, ret, err
+		}
+	}
+
+	return false, "", nil
+}
+
+func convertToString(val reflect.Value, options multiTag) (string, error) {
+	if ok, ret, err := convertMarshal(val); ok {
+		return ret, err
+	}
+
+	tp := val.Type()
+
+	// Support for time.Duration
+	if tp == reflect.TypeOf((*time.Duration)(nil)).Elem() {
+		stringer := val.Interface().(fmt.Stringer)
+		return stringer.String(), nil
+	}
+
+	switch tp.Kind() {
+	case reflect.String:
+		return val.String(), nil
+	case reflect.Bool:
+		if val.Bool() {
+			return "true", nil
+		}
+
+		return "false", nil
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		base, err := getBase(options, 10)
+
+		if err != nil {
+			return "", err
+		}
+
+		return strconv.FormatInt(val.Int(), base), nil
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		base, err := getBase(options, 10)
+
+		if err != nil {
+			return "", err
+		}
+
+		return strconv.FormatUint(val.Uint(), base), nil
+	case reflect.Float32, reflect.Float64:
+		return strconv.FormatFloat(val.Float(), 'g', -1, tp.Bits()), nil
+	case reflect.Slice:
+		if val.Len() == 0 {
+			return "", nil
+		}
+
+		ret := "["
+
+		for i := 0; i < val.Len(); i++ {
+			if i != 0 {
+				ret += ", "
+			}
+
+			item, err := convertToString(val.Index(i), options)
+
+			if err != nil {
+				return "", err
+			}
+
+			ret += item
+		}
+
+		return ret + "]", nil
+	case reflect.Map:
+		ret := "{"
+
+		for i, key := range val.MapKeys() {
+			if i != 0 {
+				ret += ", "
+			}
+
+			keyitem, err := convertToString(key, options)
+
+			if err != nil {
+				return "", err
+			}
+
+			item, err := convertToString(val.MapIndex(key), options)
+
+			if err != nil {
+				return "", err
+			}
+
+			ret += keyitem + ":" + item
+		}
+
+		return ret + "}", nil
+	case reflect.Ptr:
+		return convertToString(reflect.Indirect(val), options)
+	case reflect.Interface:
+		if !val.IsNil() {
+			return convertToString(val.Elem(), options)
+		}
+	}
+
+	return "", nil
+}
+
+func convertUnmarshal(val string, retval reflect.Value) (bool, error) {
+	if retval.Type().NumMethod() > 0 && retval.CanInterface() {
+		if unmarshaler, ok := retval.Interface().(Unmarshaler); ok {
+			return true, unmarshaler.UnmarshalFlag(val)
+		}
+	}
+
+	if retval.Type().Kind() != reflect.Ptr && retval.CanAddr() {
+		return convertUnmarshal(val, retval.Addr())
+	}
+
+	if retval.Type().Kind() == reflect.Interface && !retval.IsNil() {
+		return convertUnmarshal(val, retval.Elem())
+	}
+
+	return false, nil
+}
+
+func convert(val string, retval reflect.Value, options multiTag) error {
+	if ok, err := convertUnmarshal(val, retval); ok {
+		return err
+	}
+
+	tp := retval.Type()
+
+	// Support for time.Duration
+	if tp == reflect.TypeOf((*time.Duration)(nil)).Elem() {
+		parsed, err := time.ParseDuration(val)
+
+		if err != nil {
+			return err
+		}
+
+		retval.SetInt(int64(parsed))
+		return nil
+	}
+
+	switch tp.Kind() {
+	case reflect.String:
+		retval.SetString(val)
+	case reflect.Bool:
+		if val == "" {
+			retval.SetBool(true)
+		} else {
+			b, err := strconv.ParseBool(val)
+
+			if err != nil {
+				return err
+			}
+
+			retval.SetBool(b)
+		}
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		base, err := getBase(options, 10)
+
+		if err != nil {
+			return err
+		}
+
+		parsed, err := strconv.ParseInt(val, base, tp.Bits())
+
+		if err != nil {
+			return err
+		}
+
+		retval.SetInt(parsed)
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		base, err := getBase(options, 10)
+
+		if err != nil {
+			return err
+		}
+
+		parsed, err := strconv.ParseUint(val, base, tp.Bits())
+
+		if err != nil {
+			return err
+		}
+
+		retval.SetUint(parsed)
+	case reflect.Float32, reflect.Float64:
+		parsed, err := strconv.ParseFloat(val, tp.Bits())
+
+		if err != nil {
+			return err
+		}
+
+		retval.SetFloat(parsed)
+	case reflect.Slice:
+		elemtp := tp.Elem()
+
+		elemvalptr := reflect.New(elemtp)
+		elemval := reflect.Indirect(elemvalptr)
+
+		if err := convert(val, elemval, options); err != nil {
+			return err
+		}
+
+		retval.Set(reflect.Append(retval, elemval))
+	case reflect.Map:
+		parts := strings.SplitN(val, ":", 2)
+
+		key := parts[0]
+		var value string
+
+		if len(parts) == 2 {
+			value = parts[1]
+		}
+
+		keytp := tp.Key()
+		keyval := reflect.New(keytp)
+
+		if err := convert(key, keyval, options); err != nil {
+			return err
+		}
+
+		valuetp := tp.Elem()
+		valueval := reflect.New(valuetp)
+
+		if err := convert(value, valueval, options); err != nil {
+			return err
+		}
+
+		if retval.IsNil() {
+			retval.Set(reflect.MakeMap(tp))
+		}
+
+		retval.SetMapIndex(reflect.Indirect(keyval), reflect.Indirect(valueval))
+	case reflect.Ptr:
+		if retval.IsNil() {
+			retval.Set(reflect.New(retval.Type().Elem()))
+		}
+
+		return convert(val, reflect.Indirect(retval), options)
+	case reflect.Interface:
+		if !retval.IsNil() {
+			return convert(val, retval.Elem(), options)
+		}
+	}
+
+	return nil
+}
+
+func isPrint(s string) bool {
+	for _, c := range s {
+		if !strconv.IsPrint(c) {
+			return false
+		}
+	}
+
+	return true
+}
+
+func quoteIfNeeded(s string) string {
+	if !isPrint(s) {
+		return strconv.Quote(s)
+	}
+
+	return s
+}
+
+func quoteIfNeededV(s []string) []string {
+	ret := make([]string, len(s))
+
+	for i, v := range s {
+		ret[i] = quoteIfNeeded(v)
+	}
+
+	return ret
+}
+
+func quoteV(s []string) []string {
+	ret := make([]string, len(s))
+
+	for i, v := range s {
+		ret[i] = strconv.Quote(v)
+	}
+
+	return ret
+}
+
+func unquoteIfPossible(s string) (string, error) {
+	if len(s) == 0 || s[0] != '"' {
+		return s, nil
+	}
+
+	return strconv.Unquote(s)
+}
+
+func wrapText(s string, l int, prefix string) string {
+	// Basic text wrapping of s at spaces to fit in l
+	var ret string
+
+	s = strings.TrimSpace(s)
+
+	for len(s) > l {
+		// Try to split on space
+		suffix := ""
+
+		pos := strings.LastIndex(s[:l], " ")
+
+		if pos < 0 {
+			pos = l - 1
+			suffix = "-\n"
+		}
+
+		if len(ret) != 0 {
+			ret += "\n" + prefix
+		}
+
+		ret += strings.TrimSpace(s[:pos]) + suffix
+		s = strings.TrimSpace(s[pos:])
+	}
+
+	if len(s) > 0 {
+		if len(ret) != 0 {
+			ret += "\n" + prefix
+		}
+
+		return ret + s
+	}
+
+	return ret
+}

Godeps/_workspace/src/github.com/jessevdk/go-flags/convert_test.go

@@ -0,0 +1,175 @@
+package flags
+
+import (
+	"testing"
+	"time"
+)
+
+func expectConvert(t *testing.T, o *Option, expected string) {
+	s, err := convertToString(o.value, o.tag)
+
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	assertString(t, s, expected)
+}
+
+func TestConvertToString(t *testing.T) {
+	d, _ := time.ParseDuration("1h2m4s")
+
+	var opts = struct {
+		String string `long:"string"`
+
+		Int   int   `long:"int"`
+		Int8  int8  `long:"int8"`
+		Int16 int16 `long:"int16"`
+		Int32 int32 `long:"int32"`
+		Int64 int64 `long:"int64"`
+
+		Uint   uint   `long:"uint"`
+		Uint8  uint8  `long:"uint8"`
+		Uint16 uint16 `long:"uint16"`
+		Uint32 uint32 `long:"uint32"`
+		Uint64 uint64 `long:"uint64"`
+
+		Float32 float32 `long:"float32"`
+		Float64 float64 `long:"float64"`
+
+		Duration time.Duration `long:"duration"`
+
+		Bool bool `long:"bool"`
+
+		IntSlice    []int           `long:"int-slice"`
+		IntFloatMap map[int]float64 `long:"int-float-map"`
+
+		PtrBool   *bool       `long:"ptr-bool"`
+		Interface interface{} `long:"interface"`
+
+		Int32Base  int32  `long:"int32-base" base:"16"`
+		Uint32Base uint32 `long:"uint32-base" base:"16"`
+	}{
+		"string",
+
+		-2,
+		-1,
+		0,
+		1,
+		2,
+
+		1,
+		2,
+		3,
+		4,
+		5,
+
+		1.2,
+		-3.4,
+
+		d,
+		true,
+
+		[]int{-3, 4, -2},
+		map[int]float64{-2: 4.5},
+
+		new(bool),
+		float32(5.2),
+
+		-5823,
+		4232,
+	}
+
+	p := NewNamedParser("test", Default)
+	grp, _ := p.AddGroup("test group", "", &opts)
+
+	expects := []string{
+		"string",
+		"-2",
+		"-1",
+		"0",
+		"1",
+		"2",
+
+		"1",
+		"2",
+		"3",
+		"4",
+		"5",
+
+		"1.2",
+		"-3.4",
+
+		"1h2m4s",
+		"true",
+
+		"[-3, 4, -2]",
+		"{-2:4.5}",
+
+		"false",
+		"5.2",
+
+		"-16bf",
+		"1088",
+	}
+
+	for i, v := range grp.Options() {
+		expectConvert(t, v, expects[i])
+	}
+}
+
+func TestConvertToStringInvalidIntBase(t *testing.T) {
+	var opts = struct {
+		Int int `long:"int" base:"no"`
+	}{
+		2,
+	}
+
+	p := NewNamedParser("test", Default)
+	grp, _ := p.AddGroup("test group", "", &opts)
+	o := grp.Options()[0]
+
+	_, err := convertToString(o.value, o.tag)
+
+	if err != nil {
+		err = newErrorf(ErrMarshal, "%v", err)
+	}
+
+	assertError(t, err, ErrMarshal, "strconv.ParseInt: parsing \"no\": invalid syntax")
+}
+
+func TestConvertToStringInvalidUintBase(t *testing.T) {
+	var opts = struct {
+		Uint uint `long:"uint" base:"no"`
+	}{
+		2,
+	}
+
+	p := NewNamedParser("test", Default)
+	grp, _ := p.AddGroup("test group", "", &opts)
+	o := grp.Options()[0]
+
+	_, err := convertToString(o.value, o.tag)
+
+	if err != nil {
+		err = newErrorf(ErrMarshal, "%v", err)
+	}
+
+	assertError(t, err, ErrMarshal, "strconv.ParseInt: parsing \"no\": invalid syntax")
+}
+
+func TestWrapText(t *testing.T) {
+	s := "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+	got := wrapText(s, 60, "      ")
+	expected := `Lorem ipsum dolor sit amet, consectetur adipisicing elit,
+      sed do eiusmod tempor incididunt ut labore et dolore magna
+      aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+      ullamco laboris nisi ut aliquip ex ea commodo consequat.
+      Duis aute irure dolor in reprehenderit in voluptate velit
+      esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
+      occaecat cupidatat non proident, sunt in culpa qui officia
+      deserunt mollit anim id est laborum.`
+
+	assertDiff(t, got, expected, "wrapped text")
+}