From e98a77ff1a3ba6dae27faba1a911bb3fbf8b5848 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Mon, 3 Nov 2014 20:59:07 -0800 Subject: [PATCH] Moving to godep for dependency management --- Godeps/Godeps.json | 22 + Godeps/Readme | 5 + Godeps/_workspace/.gitignore | 2 + .../github.com/codegangsta/cli/.travis.yml | 0 .../src/github.com/codegangsta/cli/LICENSE | 0 .../src/github.com/codegangsta/cli/README.md | 0 .../src/github.com/codegangsta/cli/app.go | 0 .../github.com/codegangsta/cli/app_test.go | 0 .../cli/autocomplete/bash_autocomplete | 0 .../cli/autocomplete/zsh_autocomplete | 0 .../src/github.com/codegangsta/cli/cli.go | 0 .../github.com/codegangsta/cli/cli_test.go | 0 .../src/github.com/codegangsta/cli/command.go | 0 .../codegangsta/cli/command_test.go | 0 .../src/github.com/codegangsta/cli/context.go | 0 .../codegangsta/cli/context_test.go | 0 .../src/github.com/codegangsta/cli/flag.go | 0 .../github.com/codegangsta/cli/flag_test.go | 0 .../src/github.com/codegangsta/cli/help.go | 0 .../codegangsta/cli/helpers_test.go | 0 .../github.com/gorilla/context/.travis.yml | 0 .../src/github.com/gorilla/context/LICENSE | 0 .../src/github.com/gorilla/context/README.md | 0 .../src/github.com/gorilla/context/context.go | 0 .../gorilla/context/context_test.go | 0 .../src/github.com/gorilla/context/doc.go | 0 .../src/github.com/gorilla/mux/.travis.yml | 0 .../src/github.com/gorilla/mux/LICENSE | 0 .../src/github.com/gorilla/mux/README.md | 0 .../src/github.com/gorilla/mux/bench_test.go | 0 .../src/github.com/gorilla/mux/doc.go | 0 .../src/github.com/gorilla/mux/mux.go | 0 .../src/github.com/gorilla/mux/mux_test.go | 0 .../src/github.com/gorilla/mux/old_test.go | 0 .../src/github.com/gorilla/mux/regexp.go | 0 .../src/github.com/gorilla/mux/route.go | 0 Makefile | 32 +- README.md | 31 + .../GeertJohan/go.linenoise/.gitignore | 2 - .../GeertJohan/go.linenoise/LICENSE | 22 - .../GeertJohan/go.linenoise/README.md | 14 - .../github.com/GeertJohan/go.linenoise/doc.go | 11 - .../go.linenoise/examplenoise/examplenoise.go | 112 -- .../GeertJohan/go.linenoise/linenoise.c | 1105 ----------------- .../GeertJohan/go.linenoise/linenoise.go | 142 --- .../GeertJohan/go.linenoise/linenoise.h | 66 - .../linenoiseCompletionCallbackHook.c | 8 - .../linenoiseCompletionCallbackHook.h | 5 - .../GeertJohan/go.linenoise/windows.go | 8 - 49 files changed, 74 insertions(+), 1513 deletions(-) create mode 100644 Godeps/Godeps.json create mode 100644 Godeps/Readme create mode 100644 Godeps/_workspace/.gitignore rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/.travis.yml (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/LICENSE (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/README.md (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/app.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/app_test.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/autocomplete/bash_autocomplete (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/autocomplete/zsh_autocomplete (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/cli.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/cli_test.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/command.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/command_test.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/context.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/context_test.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/flag.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/flag_test.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/help.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/codegangsta/cli/helpers_test.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/context/.travis.yml (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/context/LICENSE (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/context/README.md (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/context/context.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/context/context_test.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/context/doc.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/mux/.travis.yml (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/mux/LICENSE (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/mux/README.md (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/mux/bench_test.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/mux/doc.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/mux/mux.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/mux/mux_test.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/mux/old_test.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/mux/regexp.go (100%) rename {third_party => Godeps/_workspace}/src/github.com/gorilla/mux/route.go (100%) delete mode 100644 third_party/src/github.com/GeertJohan/go.linenoise/.gitignore delete mode 100644 third_party/src/github.com/GeertJohan/go.linenoise/LICENSE delete mode 100644 third_party/src/github.com/GeertJohan/go.linenoise/README.md delete mode 100644 third_party/src/github.com/GeertJohan/go.linenoise/doc.go delete mode 100644 third_party/src/github.com/GeertJohan/go.linenoise/examplenoise/examplenoise.go delete mode 100644 third_party/src/github.com/GeertJohan/go.linenoise/linenoise.c delete mode 100644 third_party/src/github.com/GeertJohan/go.linenoise/linenoise.go delete mode 100644 third_party/src/github.com/GeertJohan/go.linenoise/linenoise.h delete mode 100644 third_party/src/github.com/GeertJohan/go.linenoise/linenoiseCompletionCallbackHook.c delete mode 100644 third_party/src/github.com/GeertJohan/go.linenoise/linenoiseCompletionCallbackHook.h delete mode 100644 third_party/src/github.com/GeertJohan/go.linenoise/windows.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json new file mode 100644 index 000000000..16063d0c5 --- /dev/null +++ b/Godeps/Godeps.json @@ -0,0 +1,22 @@ +{ + "ImportPath": "github.com/minios/minios", + "GoVersion": "go1.3.3", + "Packages": [ + "./..." + ], + "Deps": [ + { + "ImportPath": "github.com/codegangsta/cli", + "Comment": "1.2.0-26-gf7ebb76", + "Rev": "f7ebb761e83e21225d1d8954fde853bf8edd46c4" + }, + { + "ImportPath": "github.com/gorilla/context", + "Rev": "14f550f51af52180c2eefed15e5fd18d63c0a64a" + }, + { + "ImportPath": "github.com/gorilla/mux", + "Rev": "e444e69cbd2e2e3e0749a2f3c717cec491552bbf" + } + ] +} diff --git a/Godeps/Readme b/Godeps/Readme new file mode 100644 index 000000000..4cdaa53d5 --- /dev/null +++ b/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. diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore new file mode 100644 index 000000000..f037d684e --- /dev/null +++ b/Godeps/_workspace/.gitignore @@ -0,0 +1,2 @@ +/pkg +/bin diff --git a/third_party/src/github.com/codegangsta/cli/.travis.yml b/Godeps/_workspace/src/github.com/codegangsta/cli/.travis.yml similarity index 100% rename from third_party/src/github.com/codegangsta/cli/.travis.yml rename to Godeps/_workspace/src/github.com/codegangsta/cli/.travis.yml diff --git a/third_party/src/github.com/codegangsta/cli/LICENSE b/Godeps/_workspace/src/github.com/codegangsta/cli/LICENSE similarity index 100% rename from third_party/src/github.com/codegangsta/cli/LICENSE rename to Godeps/_workspace/src/github.com/codegangsta/cli/LICENSE diff --git a/third_party/src/github.com/codegangsta/cli/README.md b/Godeps/_workspace/src/github.com/codegangsta/cli/README.md similarity index 100% rename from third_party/src/github.com/codegangsta/cli/README.md rename to Godeps/_workspace/src/github.com/codegangsta/cli/README.md diff --git a/third_party/src/github.com/codegangsta/cli/app.go b/Godeps/_workspace/src/github.com/codegangsta/cli/app.go similarity index 100% rename from third_party/src/github.com/codegangsta/cli/app.go rename to Godeps/_workspace/src/github.com/codegangsta/cli/app.go diff --git a/third_party/src/github.com/codegangsta/cli/app_test.go b/Godeps/_workspace/src/github.com/codegangsta/cli/app_test.go similarity index 100% rename from third_party/src/github.com/codegangsta/cli/app_test.go rename to Godeps/_workspace/src/github.com/codegangsta/cli/app_test.go diff --git a/third_party/src/github.com/codegangsta/cli/autocomplete/bash_autocomplete b/Godeps/_workspace/src/github.com/codegangsta/cli/autocomplete/bash_autocomplete similarity index 100% rename from third_party/src/github.com/codegangsta/cli/autocomplete/bash_autocomplete rename to Godeps/_workspace/src/github.com/codegangsta/cli/autocomplete/bash_autocomplete diff --git a/third_party/src/github.com/codegangsta/cli/autocomplete/zsh_autocomplete b/Godeps/_workspace/src/github.com/codegangsta/cli/autocomplete/zsh_autocomplete similarity index 100% rename from third_party/src/github.com/codegangsta/cli/autocomplete/zsh_autocomplete rename to Godeps/_workspace/src/github.com/codegangsta/cli/autocomplete/zsh_autocomplete diff --git a/third_party/src/github.com/codegangsta/cli/cli.go b/Godeps/_workspace/src/github.com/codegangsta/cli/cli.go similarity index 100% rename from third_party/src/github.com/codegangsta/cli/cli.go rename to Godeps/_workspace/src/github.com/codegangsta/cli/cli.go diff --git a/third_party/src/github.com/codegangsta/cli/cli_test.go b/Godeps/_workspace/src/github.com/codegangsta/cli/cli_test.go similarity index 100% rename from third_party/src/github.com/codegangsta/cli/cli_test.go rename to Godeps/_workspace/src/github.com/codegangsta/cli/cli_test.go diff --git a/third_party/src/github.com/codegangsta/cli/command.go b/Godeps/_workspace/src/github.com/codegangsta/cli/command.go similarity index 100% rename from third_party/src/github.com/codegangsta/cli/command.go rename to Godeps/_workspace/src/github.com/codegangsta/cli/command.go diff --git a/third_party/src/github.com/codegangsta/cli/command_test.go b/Godeps/_workspace/src/github.com/codegangsta/cli/command_test.go similarity index 100% rename from third_party/src/github.com/codegangsta/cli/command_test.go rename to Godeps/_workspace/src/github.com/codegangsta/cli/command_test.go diff --git a/third_party/src/github.com/codegangsta/cli/context.go b/Godeps/_workspace/src/github.com/codegangsta/cli/context.go similarity index 100% rename from third_party/src/github.com/codegangsta/cli/context.go rename to Godeps/_workspace/src/github.com/codegangsta/cli/context.go diff --git a/third_party/src/github.com/codegangsta/cli/context_test.go b/Godeps/_workspace/src/github.com/codegangsta/cli/context_test.go similarity index 100% rename from third_party/src/github.com/codegangsta/cli/context_test.go rename to Godeps/_workspace/src/github.com/codegangsta/cli/context_test.go diff --git a/third_party/src/github.com/codegangsta/cli/flag.go b/Godeps/_workspace/src/github.com/codegangsta/cli/flag.go similarity index 100% rename from third_party/src/github.com/codegangsta/cli/flag.go rename to Godeps/_workspace/src/github.com/codegangsta/cli/flag.go diff --git a/third_party/src/github.com/codegangsta/cli/flag_test.go b/Godeps/_workspace/src/github.com/codegangsta/cli/flag_test.go similarity index 100% rename from third_party/src/github.com/codegangsta/cli/flag_test.go rename to Godeps/_workspace/src/github.com/codegangsta/cli/flag_test.go diff --git a/third_party/src/github.com/codegangsta/cli/help.go b/Godeps/_workspace/src/github.com/codegangsta/cli/help.go similarity index 100% rename from third_party/src/github.com/codegangsta/cli/help.go rename to Godeps/_workspace/src/github.com/codegangsta/cli/help.go diff --git a/third_party/src/github.com/codegangsta/cli/helpers_test.go b/Godeps/_workspace/src/github.com/codegangsta/cli/helpers_test.go similarity index 100% rename from third_party/src/github.com/codegangsta/cli/helpers_test.go rename to Godeps/_workspace/src/github.com/codegangsta/cli/helpers_test.go diff --git a/third_party/src/github.com/gorilla/context/.travis.yml b/Godeps/_workspace/src/github.com/gorilla/context/.travis.yml similarity index 100% rename from third_party/src/github.com/gorilla/context/.travis.yml rename to Godeps/_workspace/src/github.com/gorilla/context/.travis.yml diff --git a/third_party/src/github.com/gorilla/context/LICENSE b/Godeps/_workspace/src/github.com/gorilla/context/LICENSE similarity index 100% rename from third_party/src/github.com/gorilla/context/LICENSE rename to Godeps/_workspace/src/github.com/gorilla/context/LICENSE diff --git a/third_party/src/github.com/gorilla/context/README.md b/Godeps/_workspace/src/github.com/gorilla/context/README.md similarity index 100% rename from third_party/src/github.com/gorilla/context/README.md rename to Godeps/_workspace/src/github.com/gorilla/context/README.md diff --git a/third_party/src/github.com/gorilla/context/context.go b/Godeps/_workspace/src/github.com/gorilla/context/context.go similarity index 100% rename from third_party/src/github.com/gorilla/context/context.go rename to Godeps/_workspace/src/github.com/gorilla/context/context.go diff --git a/third_party/src/github.com/gorilla/context/context_test.go b/Godeps/_workspace/src/github.com/gorilla/context/context_test.go similarity index 100% rename from third_party/src/github.com/gorilla/context/context_test.go rename to Godeps/_workspace/src/github.com/gorilla/context/context_test.go diff --git a/third_party/src/github.com/gorilla/context/doc.go b/Godeps/_workspace/src/github.com/gorilla/context/doc.go similarity index 100% rename from third_party/src/github.com/gorilla/context/doc.go rename to Godeps/_workspace/src/github.com/gorilla/context/doc.go diff --git a/third_party/src/github.com/gorilla/mux/.travis.yml b/Godeps/_workspace/src/github.com/gorilla/mux/.travis.yml similarity index 100% rename from third_party/src/github.com/gorilla/mux/.travis.yml rename to Godeps/_workspace/src/github.com/gorilla/mux/.travis.yml diff --git a/third_party/src/github.com/gorilla/mux/LICENSE b/Godeps/_workspace/src/github.com/gorilla/mux/LICENSE similarity index 100% rename from third_party/src/github.com/gorilla/mux/LICENSE rename to Godeps/_workspace/src/github.com/gorilla/mux/LICENSE diff --git a/third_party/src/github.com/gorilla/mux/README.md b/Godeps/_workspace/src/github.com/gorilla/mux/README.md similarity index 100% rename from third_party/src/github.com/gorilla/mux/README.md rename to Godeps/_workspace/src/github.com/gorilla/mux/README.md diff --git a/third_party/src/github.com/gorilla/mux/bench_test.go b/Godeps/_workspace/src/github.com/gorilla/mux/bench_test.go similarity index 100% rename from third_party/src/github.com/gorilla/mux/bench_test.go rename to Godeps/_workspace/src/github.com/gorilla/mux/bench_test.go diff --git a/third_party/src/github.com/gorilla/mux/doc.go b/Godeps/_workspace/src/github.com/gorilla/mux/doc.go similarity index 100% rename from third_party/src/github.com/gorilla/mux/doc.go rename to Godeps/_workspace/src/github.com/gorilla/mux/doc.go diff --git a/third_party/src/github.com/gorilla/mux/mux.go b/Godeps/_workspace/src/github.com/gorilla/mux/mux.go similarity index 100% rename from third_party/src/github.com/gorilla/mux/mux.go rename to Godeps/_workspace/src/github.com/gorilla/mux/mux.go diff --git a/third_party/src/github.com/gorilla/mux/mux_test.go b/Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go similarity index 100% rename from third_party/src/github.com/gorilla/mux/mux_test.go rename to Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go diff --git a/third_party/src/github.com/gorilla/mux/old_test.go b/Godeps/_workspace/src/github.com/gorilla/mux/old_test.go similarity index 100% rename from third_party/src/github.com/gorilla/mux/old_test.go rename to Godeps/_workspace/src/github.com/gorilla/mux/old_test.go diff --git a/third_party/src/github.com/gorilla/mux/regexp.go b/Godeps/_workspace/src/github.com/gorilla/mux/regexp.go similarity index 100% rename from third_party/src/github.com/gorilla/mux/regexp.go rename to Godeps/_workspace/src/github.com/gorilla/mux/regexp.go diff --git a/third_party/src/github.com/gorilla/mux/route.go b/Godeps/_workspace/src/github.com/gorilla/mux/route.go similarity index 100% rename from third_party/src/github.com/gorilla/mux/route.go rename to Godeps/_workspace/src/github.com/gorilla/mux/route.go diff --git a/Makefile b/Makefile index 2aa4591ad..215a2c2d4 100644 --- a/Makefile +++ b/Makefile @@ -1,23 +1,19 @@ -GOPATH := $(CURDIR)/tmp/gopath +#GOPATH := $(CURDIR)/tmp/gopath -all: build test copy_bin - -copy_bin: - cp tmp/gopath/bin/* bin/ - -stage_build: - mkdir -p $(GOPATH) - mkdir -p bin - mkdir -p tmp/gopath/src/github.com/minios/minios - rsync -a . tmp/gopath/src/github.com/minios/minios/ - rsync -a third_party/* tmp/gopath +all: test install test: - go test github.com/minios/minios - go test github.com/minios/minios/minio + godep go test github.com/minios/minios + godep go test github.com/minios/minios/minio -build: stage_build - go install github.com/minios/minios/minio +install: + godep go install github.com/minios/minios/minio -clean: - rm -rf tmp bin +save: + godep save ./... + +restore: + godep restore + +env: + godep go env diff --git a/README.md b/README.md index e69de29bb..076e18e4b 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,31 @@ +Dependencies +============ +* go1.3.3 +* godep + * go get github.com/tools/godep + +Dependency management +===================== + +Install or updating a new dependency +------------------------------------ +```sh +go get -u github.com/example/dependency +# import github.com/example/dependency in go src code +godep save ./... +``` + +Commit all Godep/ modifications, including vendorized files. + +Restoring dev environment dependencies +-------------------------------------- +```sh +godep restore +``` + + +Compiling +========= +```sh +make +``` diff --git a/third_party/src/github.com/GeertJohan/go.linenoise/.gitignore b/third_party/src/github.com/GeertJohan/go.linenoise/.gitignore deleted file mode 100644 index 457367300..000000000 --- a/third_party/src/github.com/GeertJohan/go.linenoise/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*sublime* -/examplenoise/examplenoise \ No newline at end of file diff --git a/third_party/src/github.com/GeertJohan/go.linenoise/LICENSE b/third_party/src/github.com/GeertJohan/go.linenoise/LICENSE deleted file mode 100644 index 8b4409d7f..000000000 --- a/third_party/src/github.com/GeertJohan/go.linenoise/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 2013, Geert-Johan Riemer -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. -2. 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. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/third_party/src/github.com/GeertJohan/go.linenoise/README.md b/third_party/src/github.com/GeertJohan/go.linenoise/README.md deleted file mode 100644 index 89787c76b..000000000 --- a/third_party/src/github.com/GeertJohan/go.linenoise/README.md +++ /dev/null @@ -1,14 +0,0 @@ -## go.linenoise - -go.linenoise is a [go](http://golang.org) package wrapping the [linenoise](https://github.com/antirez/linenoise) C library. - -This package does not compile on windows. - -### Documentation -Documentation can be found at [godoc.org/github.com/GeertJohan/go.linenoise](http://godoc.org/github.com/GeertJohan/go.linenoise). -An example is located in the folder [examplenoise](examplenoise). - -### License -All code in this repository is licensed under a BSD license. -This project wraps [linenoise](https://github.com/antirez/linenoise) which is written by Salvatore Sanfilippo and Pieter Noordhuis. The license for linenoise is included in the files `linenoise.c` and `linenoise.h`. -For all other files please read the [LICENSE](LICENSE) file. \ No newline at end of file diff --git a/third_party/src/github.com/GeertJohan/go.linenoise/doc.go b/third_party/src/github.com/GeertJohan/go.linenoise/doc.go deleted file mode 100644 index f363a2e8d..000000000 --- a/third_party/src/github.com/GeertJohan/go.linenoise/doc.go +++ /dev/null @@ -1,11 +0,0 @@ -// Package linenoise wraps the linenoise library (https://github.com/antirez/linenoise). -// -// The package is imported with "go." prefix -// import "github.com/GeertJohan/go.linenoise" -// -// Simple readline usage: -// linenoise.Line("prompt> ") -// -// Adding lines to history, you could simply do this for every line you read. -// linenoise.AddHistory("This will be displayed in prompt when arrow-up is pressed") -package linenoise diff --git a/third_party/src/github.com/GeertJohan/go.linenoise/examplenoise/examplenoise.go b/third_party/src/github.com/GeertJohan/go.linenoise/examplenoise/examplenoise.go deleted file mode 100644 index cbacb2c57..000000000 --- a/third_party/src/github.com/GeertJohan/go.linenoise/examplenoise/examplenoise.go +++ /dev/null @@ -1,112 +0,0 @@ -package main - -import ( - "fmt" - "github.com/GeertJohan/go.linenoise" - "os" - "strings" -) - -func main() { - fmt.Println("Welcome to go.linenoise example.") - writeHelp() - for { - str, err := linenoise.Line("prompt> ") - if err != nil { - if err == linenoise.KillSignalError { - quit() - } - fmt.Println("Unexpected error: %s", err) - quit() - } - fields := strings.Fields(str) - - // check if there is any valid input at all - if len(fields) == 0 { - writeUnrecognized() - continue - } - - // switch on the command - switch fields[0] { - case "help": - writeHelp() - case "echo": - fmt.Printf("echo: %s\n\n", str[5:]) - case "clear": - linenoise.Clear() - case "multiline": - fmt.Println("Setting linenoise to multiline") - linenoise.SetMultiline(true) - case "singleline": - fmt.Println("Setting linenoise to singleline") - linenoise.SetMultiline(false) - case "complete": - fmt.Println("Setting arguments as completion values for linenoise.") - fmt.Printf("%d arguments: %s\n", len(fields)-1, fields[1:]) - completionHandler := func(in string) []string { - return fields[1:] - } - linenoise.SetCompletionHandler(completionHandler) - case "printKeyCodes": - linenoise.PrintKeyCodes() - case "addHistory": - if len(str) < 12 { - fmt.Println("No argument given.") - } - err := linenoise.AddHistory(str[11:]) - if err != nil { - fmt.Printf("Error: %s\n", err) - } - case "save": - if len(fields) != 2 { - fmt.Println("Error. Expecting 'save '.") - continue - } - err := linenoise.SaveHistory(fields[1]) - if err != nil { - fmt.Printf("Error on save: %s\n", err) - } - case "load": - if len(fields) != 2 { - fmt.Println("Error. Expecting 'load '.") - continue - } - err := linenoise.LoadHistory(fields[1]) - if err != nil { - fmt.Printf("Error on load: %s\n", err) - } - case "quit": - quit() - default: - writeUnrecognized() - } - } -} - -func quit() { - fmt.Println("Thanks for running the go.linenoise example.") - fmt.Println("") - os.Exit(0) -} - -func writeHelp() { - fmt.Println("help write this message") - fmt.Println("echo ... echo the arguments") - fmt.Println("clear clear the screen") - fmt.Println("multiline set linenoise to multiline") - fmt.Println("singleline set linenoise to singleline") - fmt.Println("complete ... set arguments as completion values") - fmt.Println("addHistory ... add arguments to linenoise history") - fmt.Println("save save the history to file") - fmt.Println("load load the history from file") - fmt.Println("quit stop the program") - fmt.Println("") - fmt.Println("Use the arrow up and down keys to walk through history.") - fmt.Println("Note that you have to use addHistory to create history entries. Commands are not added to history in this example.") - fmt.Println("") -} - -func writeUnrecognized() { - fmt.Println("Unrecognized command. Use 'help'.") -} diff --git a/third_party/src/github.com/GeertJohan/go.linenoise/linenoise.c b/third_party/src/github.com/GeertJohan/go.linenoise/linenoise.c deleted file mode 100644 index ee72db2e2..000000000 --- a/third_party/src/github.com/GeertJohan/go.linenoise/linenoise.c +++ /dev/null @@ -1,1105 +0,0 @@ -/* linenoise.c -- guerrilla line editing library against the idea that a - * line editing lib needs to be 20,000 lines of C code. - * - * You can find the latest source code at: - * - * http://github.com/antirez/linenoise - * - * Does a number of crazy assumptions that happen to be true in 99.9999% of - * the 2010 UNIX computers around. - * - * ------------------------------------------------------------------------ - * - * Copyright (c) 2010-2014, Salvatore Sanfilippo - * Copyright (c) 2010-2013, Pieter Noordhuis - * - * 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. - * - * * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * ------------------------------------------------------------------------ - * - * References: - * - http://invisible-island.net/xterm/ctlseqs/ctlseqs.html - * - http://www.3waylabs.com/nw/WWW/products/wizcon/vt220.html - * - * Todo list: - * - Filter bogus Ctrl+ combinations. - * - Win32 support - * - * Bloat: - * - History search like Ctrl+r in readline? - * - * List of escape sequences used by this program, we do everything just - * with three sequences. In order to be so cheap we may have some - * flickering effect with some slow terminal, but the lesser sequences - * the more compatible. - * - * EL (Erase Line) - * Sequence: ESC [ n K - * Effect: if n is 0 or missing, clear from cursor to end of line - * Effect: if n is 1, clear from beginning of line to cursor - * Effect: if n is 2, clear entire line - * - * CUF (CUrsor Forward) - * Sequence: ESC [ n C - * Effect: moves cursor forward n chars - * - * CUB (CUrsor Backward) - * Sequence: ESC [ n D - * Effect: moves cursor backward n chars - * - * The following is used to get the terminal width if getting - * the width with the TIOCGWINSZ ioctl fails - * - * DSR (Device Status Report) - * Sequence: ESC [ 6 n - * Effect: reports the current cusor position as ESC [ n ; m R - * where n is the row and m is the column - * - * When multi line mode is enabled, we also use an additional escape - * sequence. However multi line editing is disabled by default. - * - * CUU (Cursor Up) - * Sequence: ESC [ n A - * Effect: moves cursor up of n chars. - * - * CUD (Cursor Down) - * Sequence: ESC [ n B - * Effect: moves cursor down of n chars. - * - * When linenoiseClearScreen() is called, two additional escape sequences - * are used in order to clear the screen and position the cursor at home - * position. - * - * CUP (Cursor position) - * Sequence: ESC [ H - * Effect: moves the cursor to upper left corner - * - * ED (Erase display) - * Sequence: ESC [ 2 J - * Effect: clear the whole screen - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "linenoise.h" - -#define LINENOISE_DEFAULT_HISTORY_MAX_LEN 100 -#define LINENOISE_MAX_LINE 4096 -static char *unsupported_term[] = {"dumb","cons25","emacs",NULL}; -static linenoiseCompletionCallback *completionCallback = NULL; - -static struct termios orig_termios; /* In order to restore at exit.*/ -static int rawmode = 0; /* For atexit() function to check if restore is needed*/ -static int mlmode = 0; /* Multi line mode. Default is single line. */ -static int atexit_registered = 0; /* Register atexit just 1 time. */ -static int history_max_len = LINENOISE_DEFAULT_HISTORY_MAX_LEN; -static int history_len = 0; -static char **history = NULL; - -/* The linenoiseState structure represents the state during line editing. - * We pass this state to functions implementing specific editing - * functionalities. */ -struct linenoiseState { - int ifd; /* Terminal stdin file descriptor. */ - int ofd; /* Terminal stdout file descriptor. */ - char *buf; /* Edited line buffer. */ - size_t buflen; /* Edited line buffer size. */ - const char *prompt; /* Prompt to display. */ - size_t plen; /* Prompt length. */ - size_t pos; /* Current cursor position. */ - size_t oldpos; /* Previous refresh cursor position. */ - size_t len; /* Current edited line length. */ - size_t cols; /* Number of columns in terminal. */ - size_t maxrows; /* Maximum num of rows used so far (multiline mode) */ - int history_index; /* The history index we are currently editing. */ -}; - -enum KEY_ACTION{ - KEY_NULL = 0, /* NULL */ - CTRL_A = 1, /* Ctrl+a */ - CTRL_B = 2, /* Ctrl-b */ - CTRL_C = 3, /* Ctrl-c */ - CTRL_D = 4, /* Ctrl-d */ - CTRL_E = 5, /* Ctrl-e */ - CTRL_F = 6, /* Ctrl-f */ - CTRL_H = 8, /* Ctrl-h */ - TAB = 9, /* Tab */ - CTRL_K = 11, /* Ctrl+k */ - CTRL_L = 12, /* Ctrl+l */ - ENTER = 13, /* Enter */ - CTRL_N = 14, /* Ctrl-n */ - CTRL_P = 16, /* Ctrl-p */ - CTRL_T = 20, /* Ctrl-t */ - CTRL_U = 21, /* Ctrl+u */ - CTRL_W = 23, /* Ctrl+w */ - ESC = 27, /* Escape */ - BACKSPACE = 127 /* Backspace */ -}; - -static void linenoiseAtExit(void); -int linenoiseHistoryAdd(const char *line); -static void refreshLine(struct linenoiseState *l); - -/* Debugging macro. */ -#if 0 -FILE *lndebug_fp = NULL; -#define lndebug(...) \ - do { \ - if (lndebug_fp == NULL) { \ - lndebug_fp = fopen("/tmp/lndebug.txt","a"); \ - fprintf(lndebug_fp, \ - "[%d %d %d] p: %d, rows: %d, rpos: %d, max: %d, oldmax: %d\n", \ - (int)l->len,(int)l->pos,(int)l->oldpos,plen,rows,rpos, \ - (int)l->maxrows,old_rows); \ - } \ - fprintf(lndebug_fp, ", " __VA_ARGS__); \ - fflush(lndebug_fp); \ - } while (0) -#else -#define lndebug(fmt, ...) -#endif - -/* ======================= Low level terminal handling ====================== */ - -/* Set if to use or not the multi line mode. */ -void linenoiseSetMultiLine(int ml) { - mlmode = ml; -} - -/* Return true if the terminal name is in the list of terminals we know are - * not able to understand basic escape sequences. */ -static int isUnsupportedTerm(void) { - char *term = getenv("TERM"); - int j; - - if (term == NULL) return 0; - for (j = 0; unsupported_term[j]; j++) - if (!strcasecmp(term,unsupported_term[j])) return 1; - return 0; -} - -/* Raw mode: 1960 magic shit. */ -static int enableRawMode(int fd) { - struct termios raw; - - if (!isatty(STDIN_FILENO)) goto fatal; - if (!atexit_registered) { - atexit(linenoiseAtExit); - atexit_registered = 1; - } - if (tcgetattr(fd,&orig_termios) == -1) goto fatal; - - raw = orig_termios; /* modify the original mode */ - /* input modes: no break, no CR to NL, no parity check, no strip char, - * no start/stop output control. */ - raw.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); - /* output modes - disable post processing */ - raw.c_oflag &= ~(OPOST); - /* control modes - set 8 bit chars */ - raw.c_cflag |= (CS8); - /* local modes - choing off, canonical off, no extended functions, - * no signal chars (^Z,^C) */ - raw.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG); - /* control chars - set return condition: min number of bytes and timer. - * We want read to return every single byte, without timeout. */ - raw.c_cc[VMIN] = 1; raw.c_cc[VTIME] = 0; /* 1 byte, no timer */ - - /* put terminal in raw mode after flushing */ - if (tcsetattr(fd,TCSAFLUSH,&raw) < 0) goto fatal; - rawmode = 1; - return 0; - -fatal: - errno = ENOTTY; - return -1; -} - -static void disableRawMode(int fd) { - /* Don't even check the return value as it's too late. */ - if (rawmode && tcsetattr(fd,TCSAFLUSH,&orig_termios) != -1) - rawmode = 0; -} - -/* Use the ESC [6n escape sequence to query the horizontal cursor position - * and return it. On error -1 is returned, on success the position of the - * cursor. */ -static int getCursorPosition(int ifd, int ofd) { - char buf[32]; - int cols, rows; - unsigned int i = 0; - - /* Report cursor location */ - if (write(ofd, "\x1b[6n", 4) != 4) return -1; - - /* Read the response: ESC [ rows ; cols R */ - while (i < sizeof(buf)-1) { - if (read(ifd,buf+i,1) != 1) break; - if (buf[i] == 'R') break; - i++; - } - buf[i] = '\0'; - - /* Parse it. */ - if (buf[0] != ESC || buf[1] != '[') return -1; - if (sscanf(buf+2,"%d;%d",&rows,&cols) != 2) return -1; - return cols; -} - -/* Try to get the number of columns in the current terminal, or assume 80 - * if it fails. */ -static int getColumns(int ifd, int ofd) { - struct winsize ws; - - if (ioctl(1, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) { - /* ioctl() failed. Try to query the terminal itself. */ - int start, cols; - - /* Get the initial position so we can restore it later. */ - start = getCursorPosition(ifd,ofd); - if (start == -1) goto failed; - - /* Go to right margin and get position. */ - if (write(ofd,"\x1b[999C",6) != 6) goto failed; - cols = getCursorPosition(ifd,ofd); - if (cols == -1) goto failed; - - /* Restore position. */ - if (cols > start) { - char seq[32]; - snprintf(seq,32,"\x1b[%dD",cols-start); - if (write(ofd,seq,strlen(seq)) == -1) { - /* Can't recover... */ - } - } - return cols; - } else { - return ws.ws_col; - } - -failed: - return 80; -} - -/* Clear the screen. Used to handle ctrl+l */ -void linenoiseClearScreen(void) { - if (write(STDOUT_FILENO,"\x1b[H\x1b[2J",7) <= 0) { - /* nothing to do, just to avoid warning. */ - } -} - -/* Beep, used for completion when there is nothing to complete or when all - * the choices were already shown. */ -static void linenoiseBeep(void) { - fprintf(stderr, "\x7"); - fflush(stderr); -} - -/* ============================== Completion ================================ */ - -/* Free a list of completion option populated by linenoiseAddCompletion(). */ -static void freeCompletions(linenoiseCompletions *lc) { - size_t i; - for (i = 0; i < lc->len; i++) - free(lc->cvec[i]); - if (lc->cvec != NULL) - free(lc->cvec); -} - -/* This is an helper function for linenoiseEdit() and is called when the - * user types the key in order to complete the string currently in the - * input. - * - * The state of the editing is encapsulated into the pointed linenoiseState - * structure as described in the structure definition. */ -static int completeLine(struct linenoiseState *ls) { - linenoiseCompletions lc = { 0, NULL }; - int nread, nwritten; - char c = 0; - - completionCallback(ls->buf,&lc); - if (lc.len == 0) { - linenoiseBeep(); - } else { - size_t stop = 0, i = 0; - - while(!stop) { - /* Show completion or original buffer */ - if (i < lc.len) { - struct linenoiseState saved = *ls; - - ls->len = ls->pos = strlen(lc.cvec[i]); - ls->buf = lc.cvec[i]; - refreshLine(ls); - ls->len = saved.len; - ls->pos = saved.pos; - ls->buf = saved.buf; - } else { - refreshLine(ls); - } - - nread = read(ls->ifd,&c,1); - if (nread <= 0) { - freeCompletions(&lc); - return -1; - } - - switch(c) { - case 9: /* tab */ - i = (i+1) % (lc.len+1); - if (i == lc.len) linenoiseBeep(); - break; - case 27: /* escape */ - /* Re-show original buffer */ - if (i < lc.len) refreshLine(ls); - stop = 1; - break; - default: - /* Update buffer and return */ - if (i < lc.len) { - nwritten = snprintf(ls->buf,ls->buflen,"%s",lc.cvec[i]); - ls->len = ls->pos = nwritten; - } - stop = 1; - break; - } - } - } - - freeCompletions(&lc); - return c; /* Return last read character */ -} - -/* Register a callback function to be called for tab-completion. */ -void linenoiseSetCompletionCallback(linenoiseCompletionCallback *fn) { - completionCallback = fn; -} - -/* This function is used by the callback function registered by the user - * in order to add completion options given the input string when the - * user typed . See the example.c source code for a very easy to - * understand example. */ -void linenoiseAddCompletion(linenoiseCompletions *lc, const char *str) { - size_t len = strlen(str); - char *copy, **cvec; - - copy = malloc(len+1); - if (copy == NULL) return; - memcpy(copy,str,len+1); - cvec = realloc(lc->cvec,sizeof(char*)*(lc->len+1)); - if (cvec == NULL) { - free(copy); - return; - } - lc->cvec = cvec; - lc->cvec[lc->len++] = copy; -} - -/* =========================== Line editing ================================= */ - -/* We define a very simple "append buffer" structure, that is an heap - * allocated string where we can append to. This is useful in order to - * write all the escape sequences in a buffer and flush them to the standard - * output in a single call, to avoid flickering effects. */ -struct abuf { - char *b; - int len; -}; - -static void abInit(struct abuf *ab) { - ab->b = NULL; - ab->len = 0; -} - -static void abAppend(struct abuf *ab, const char *s, int len) { - char *new = realloc(ab->b,ab->len+len); - - if (new == NULL) return; - memcpy(new+ab->len,s,len); - ab->b = new; - ab->len += len; -} - -static void abFree(struct abuf *ab) { - free(ab->b); -} - -/* Single line low level line refresh. - * - * Rewrite the currently edited line accordingly to the buffer content, - * cursor position, and number of columns of the terminal. */ -static void refreshSingleLine(struct linenoiseState *l) { - char seq[64]; - size_t plen = strlen(l->prompt); - int fd = l->ofd; - char *buf = l->buf; - size_t len = l->len; - size_t pos = l->pos; - struct abuf ab; - - while((plen+pos) >= l->cols) { - buf++; - len--; - pos--; - } - while (plen+len > l->cols) { - len--; - } - - abInit(&ab); - /* Cursor to left edge */ - snprintf(seq,64,"\r"); - abAppend(&ab,seq,strlen(seq)); - /* Write the prompt and the current buffer content */ - abAppend(&ab,l->prompt,strlen(l->prompt)); - abAppend(&ab,buf,len); - /* Erase to right */ - snprintf(seq,64,"\x1b[0K"); - abAppend(&ab,seq,strlen(seq)); - /* Move cursor to original position. */ - snprintf(seq,64,"\r\x1b[%dC", (int)(pos+plen)); - abAppend(&ab,seq,strlen(seq)); - if (write(fd,ab.b,ab.len) == -1) {} /* Can't recover from write error. */ - abFree(&ab); -} - -/* Multi line low level line refresh. - * - * Rewrite the currently edited line accordingly to the buffer content, - * cursor position, and number of columns of the terminal. */ -static void refreshMultiLine(struct linenoiseState *l) { - char seq[64]; - int plen = strlen(l->prompt); - int rows = (plen+l->len+l->cols-1)/l->cols; /* rows used by current buf. */ - int rpos = (plen+l->oldpos+l->cols)/l->cols; /* cursor relative row. */ - int rpos2; /* rpos after refresh. */ - int col; /* colum position, zero-based. */ - int old_rows = l->maxrows; - int fd = l->ofd, j; - struct abuf ab; - - /* Update maxrows if needed. */ - if (rows > (int)l->maxrows) l->maxrows = rows; - - /* First step: clear all the lines used before. To do so start by - * going to the last row. */ - abInit(&ab); - if (old_rows-rpos > 0) { - lndebug("go down %d", old_rows-rpos); - snprintf(seq,64,"\x1b[%dB", old_rows-rpos); - abAppend(&ab,seq,strlen(seq)); - } - - /* Now for every row clear it, go up. */ - for (j = 0; j < old_rows-1; j++) { - lndebug("clear+up"); - snprintf(seq,64,"\r\x1b[0K\x1b[1A"); - abAppend(&ab,seq,strlen(seq)); - } - - /* Clean the top line. */ - lndebug("clear"); - snprintf(seq,64,"\r\x1b[0K"); - abAppend(&ab,seq,strlen(seq)); - - /* Write the prompt and the current buffer content */ - abAppend(&ab,l->prompt,strlen(l->prompt)); - abAppend(&ab,l->buf,l->len); - - /* If we are at the very end of the screen with our prompt, we need to - * emit a newline and move the prompt to the first column. */ - if (l->pos && - l->pos == l->len && - (l->pos+plen) % l->cols == 0) - { - lndebug(""); - abAppend(&ab,"\n",1); - snprintf(seq,64,"\r"); - abAppend(&ab,seq,strlen(seq)); - rows++; - if (rows > (int)l->maxrows) l->maxrows = rows; - } - - /* Move cursor to right position. */ - rpos2 = (plen+l->pos+l->cols)/l->cols; /* current cursor relative row. */ - lndebug("rpos2 %d", rpos2); - - /* Go up till we reach the expected positon. */ - if (rows-rpos2 > 0) { - lndebug("go-up %d", rows-rpos2); - snprintf(seq,64,"\x1b[%dA", rows-rpos2); - abAppend(&ab,seq,strlen(seq)); - } - - /* Set column. */ - col = (plen+(int)l->pos) % (int)l->cols; - lndebug("set col %d", 1+col); - if (col) - snprintf(seq,64,"\r\x1b[%dC", col); - else - snprintf(seq,64,"\r"); - abAppend(&ab,seq,strlen(seq)); - - lndebug("\n"); - l->oldpos = l->pos; - - if (write(fd,ab.b,ab.len) == -1) {} /* Can't recover from write error. */ - abFree(&ab); -} - -/* Calls the two low level functions refreshSingleLine() or - * refreshMultiLine() according to the selected mode. */ -static void refreshLine(struct linenoiseState *l) { - if (mlmode) - refreshMultiLine(l); - else - refreshSingleLine(l); -} - -/* Insert the character 'c' at cursor current position. - * - * On error writing to the terminal -1 is returned, otherwise 0. */ -int linenoiseEditInsert(struct linenoiseState *l, char c) { - if (l->len < l->buflen) { - if (l->len == l->pos) { - l->buf[l->pos] = c; - l->pos++; - l->len++; - l->buf[l->len] = '\0'; - if ((!mlmode && l->plen+l->len < l->cols) /* || mlmode */) { - /* Avoid a full update of the line in the - * trivial case. */ - if (write(l->ofd,&c,1) == -1) return -1; - } else { - refreshLine(l); - } - } else { - memmove(l->buf+l->pos+1,l->buf+l->pos,l->len-l->pos); - l->buf[l->pos] = c; - l->len++; - l->pos++; - l->buf[l->len] = '\0'; - refreshLine(l); - } - } - return 0; -} - -/* Move cursor on the left. */ -void linenoiseEditMoveLeft(struct linenoiseState *l) { - if (l->pos > 0) { - l->pos--; - refreshLine(l); - } -} - -/* Move cursor on the right. */ -void linenoiseEditMoveRight(struct linenoiseState *l) { - if (l->pos != l->len) { - l->pos++; - refreshLine(l); - } -} - -/* Move cursor to the start of the line. */ -void linenoiseEditMoveHome(struct linenoiseState *l) { - if (l->pos != 0) { - l->pos = 0; - refreshLine(l); - } -} - -/* Move cursor to the end of the line. */ -void linenoiseEditMoveEnd(struct linenoiseState *l) { - if (l->pos != l->len) { - l->pos = l->len; - refreshLine(l); - } -} - -/* Substitute the currently edited line with the next or previous history - * entry as specified by 'dir'. */ -#define LINENOISE_HISTORY_NEXT 0 -#define LINENOISE_HISTORY_PREV 1 -void linenoiseEditHistoryNext(struct linenoiseState *l, int dir) { - if (history_len > 1) { - /* Update the current history entry before to - * overwrite it with the next one. */ - free(history[history_len - 1 - l->history_index]); - history[history_len - 1 - l->history_index] = strdup(l->buf); - /* Show the new entry */ - l->history_index += (dir == LINENOISE_HISTORY_PREV) ? 1 : -1; - if (l->history_index < 0) { - l->history_index = 0; - return; - } else if (l->history_index >= history_len) { - l->history_index = history_len-1; - return; - } - strncpy(l->buf,history[history_len - 1 - l->history_index],l->buflen); - l->buf[l->buflen-1] = '\0'; - l->len = l->pos = strlen(l->buf); - refreshLine(l); - } -} - -/* Delete the character at the right of the cursor without altering the cursor - * position. Basically this is what happens with the "Delete" keyboard key. */ -void linenoiseEditDelete(struct linenoiseState *l) { - if (l->len > 0 && l->pos < l->len) { - memmove(l->buf+l->pos,l->buf+l->pos+1,l->len-l->pos-1); - l->len--; - l->buf[l->len] = '\0'; - refreshLine(l); - } -} - -/* Backspace implementation. */ -void linenoiseEditBackspace(struct linenoiseState *l) { - if (l->pos > 0 && l->len > 0) { - memmove(l->buf+l->pos-1,l->buf+l->pos,l->len-l->pos); - l->pos--; - l->len--; - l->buf[l->len] = '\0'; - refreshLine(l); - } -} - -/* Delete the previosu word, maintaining the cursor at the start of the - * current word. */ -void linenoiseEditDeletePrevWord(struct linenoiseState *l) { - size_t old_pos = l->pos; - size_t diff; - - while (l->pos > 0 && l->buf[l->pos-1] == ' ') - l->pos--; - while (l->pos > 0 && l->buf[l->pos-1] != ' ') - l->pos--; - diff = old_pos - l->pos; - memmove(l->buf+l->pos,l->buf+old_pos,l->len-old_pos+1); - l->len -= diff; - refreshLine(l); -} - -/* This function is the core of the line editing capability of linenoise. - * It expects 'fd' to be already in "raw mode" so that every key pressed - * will be returned ASAP to read(). - * - * The resulting string is put into 'buf' when the user type enter, or - * when ctrl+d is typed. - * - * The function returns the length of the current buffer. */ -static int linenoiseEdit(int stdin_fd, int stdout_fd, char *buf, size_t buflen, const char *prompt) -{ - struct linenoiseState l; - - /* Populate the linenoise state that we pass to functions implementing - * specific editing functionalities. */ - l.ifd = stdin_fd; - l.ofd = stdout_fd; - l.buf = buf; - l.buflen = buflen; - l.prompt = prompt; - l.plen = strlen(prompt); - l.oldpos = l.pos = 0; - l.len = 0; - l.cols = getColumns(stdin_fd, stdout_fd); - l.maxrows = 0; - l.history_index = 0; - - /* Buffer starts empty. */ - l.buf[0] = '\0'; - l.buflen--; /* Make sure there is always space for the nulterm */ - - /* The latest history entry is always our current buffer, that - * initially is just an empty string. */ - linenoiseHistoryAdd(""); - - if (write(l.ofd,prompt,l.plen) == -1) return -1; - while(1) { - char c; - int nread; - char seq[3]; - - nread = read(l.ifd,&c,1); - if (nread <= 0) return l.len; - - /* Only autocomplete when the callback is set. It returns < 0 when - * there was an error reading from fd. Otherwise it will return the - * character that should be handled next. */ - if (c == 9 && completionCallback != NULL) { - c = completeLine(&l); - /* Return on errors */ - if (c < 0) return l.len; - /* Read next character when 0 */ - if (c == 0) continue; - } - - switch(c) { - case ENTER: /* enter */ - history_len--; - free(history[history_len]); - if (mlmode) linenoiseEditMoveEnd(&l); - return (int)l.len; - case CTRL_C: /* ctrl-c */ - errno = EAGAIN; - return -1; - case BACKSPACE: /* backspace */ - case 8: /* ctrl-h */ - linenoiseEditBackspace(&l); - break; - case CTRL_D: /* ctrl-d, remove char at right of cursor, or if the - line is empty, act as end-of-file. */ - if (l.len > 0) { - linenoiseEditDelete(&l); - } else { - history_len--; - free(history[history_len]); - return -1; - } - break; - case CTRL_T: /* ctrl-t, swaps current character with previous. */ - if (l.pos > 0 && l.pos < l.len) { - int aux = buf[l.pos-1]; - buf[l.pos-1] = buf[l.pos]; - buf[l.pos] = aux; - if (l.pos != l.len-1) l.pos++; - refreshLine(&l); - } - break; - case CTRL_B: /* ctrl-b */ - linenoiseEditMoveLeft(&l); - break; - case CTRL_F: /* ctrl-f */ - linenoiseEditMoveRight(&l); - break; - case CTRL_P: /* ctrl-p */ - linenoiseEditHistoryNext(&l, LINENOISE_HISTORY_PREV); - break; - case CTRL_N: /* ctrl-n */ - linenoiseEditHistoryNext(&l, LINENOISE_HISTORY_NEXT); - break; - case ESC: /* escape sequence */ - /* Read the next two bytes representing the escape sequence. - * Use two calls to handle slow terminals returning the two - * chars at different times. */ - if (read(l.ifd,seq,1) == -1) break; - if (read(l.ifd,seq+1,1) == -1) break; - - /* ESC [ sequences. */ - if (seq[0] == '[') { - if (seq[1] >= '0' && seq[1] <= '9') { - /* Extended escape, read additional byte. */ - if (read(l.ifd,seq+2,1) == -1) break; - if (seq[2] == '~') { - switch(seq[1]) { - case '3': /* Delete key. */ - linenoiseEditDelete(&l); - break; - } - } - } else { - switch(seq[1]) { - case 'A': /* Up */ - linenoiseEditHistoryNext(&l, LINENOISE_HISTORY_PREV); - break; - case 'B': /* Down */ - linenoiseEditHistoryNext(&l, LINENOISE_HISTORY_NEXT); - break; - case 'C': /* Right */ - linenoiseEditMoveRight(&l); - break; - case 'D': /* Left */ - linenoiseEditMoveLeft(&l); - break; - case 'H': /* Home */ - linenoiseEditMoveHome(&l); - break; - case 'F': /* End*/ - linenoiseEditMoveEnd(&l); - break; - } - } - } - - /* ESC O sequences. */ - else if (seq[0] == 'O') { - switch(seq[1]) { - case 'H': /* Home */ - linenoiseEditMoveHome(&l); - break; - case 'F': /* End*/ - linenoiseEditMoveEnd(&l); - break; - } - } - break; - default: - if (linenoiseEditInsert(&l,c)) return -1; - break; - case CTRL_U: /* Ctrl+u, delete the whole line. */ - buf[0] = '\0'; - l.pos = l.len = 0; - refreshLine(&l); - break; - case CTRL_K: /* Ctrl+k, delete from current to end of line. */ - buf[l.pos] = '\0'; - l.len = l.pos; - refreshLine(&l); - break; - case CTRL_A: /* Ctrl+a, go to the start of the line */ - linenoiseEditMoveHome(&l); - break; - case CTRL_E: /* ctrl+e, go to the end of the line */ - linenoiseEditMoveEnd(&l); - break; - case CTRL_L: /* ctrl+l, clear screen */ - linenoiseClearScreen(); - refreshLine(&l); - break; - case CTRL_W: /* ctrl+w, delete previous word */ - linenoiseEditDeletePrevWord(&l); - break; - } - } - return l.len; -} - -/* This special mode is used by linenoise in order to print scan codes - * on screen for debugging / development purposes. It is implemented - * by the linenoise_example program using the --keycodes option. */ -void linenoisePrintKeyCodes(void) { - char quit[4]; - - printf("Linenoise key codes debugging mode.\n" - "Press keys to see scan codes. Type 'quit' at any time to exit.\n"); - if (enableRawMode(STDIN_FILENO) == -1) return; - memset(quit,' ',4); - while(1) { - char c; - int nread; - - nread = read(STDIN_FILENO,&c,1); - if (nread <= 0) continue; - memmove(quit,quit+1,sizeof(quit)-1); /* shift string to left. */ - quit[sizeof(quit)-1] = c; /* Insert current char on the right. */ - if (memcmp(quit,"quit",sizeof(quit)) == 0) break; - - printf("'%c' %02x (%d) (type quit to exit)\n", - isprint(c) ? c : '?', (int)c, (int)c); - printf("\r"); /* Go left edge manually, we are in raw mode. */ - fflush(stdout); - } - disableRawMode(STDIN_FILENO); -} - -/* This function calls the line editing function linenoiseEdit() using - * the STDIN file descriptor set in raw mode. */ -static int linenoiseRaw(char *buf, size_t buflen, const char *prompt) { - int count; - - if (buflen == 0) { - errno = EINVAL; - return -1; - } - if (!isatty(STDIN_FILENO)) { - /* Not a tty: read from file / pipe. */ - if (fgets(buf, buflen, stdin) == NULL) return -1; - count = strlen(buf); - if (count && buf[count-1] == '\n') { - count--; - buf[count] = '\0'; - } - } else { - /* Interactive editing. */ - if (enableRawMode(STDIN_FILENO) == -1) return -1; - count = linenoiseEdit(STDIN_FILENO, STDOUT_FILENO, buf, buflen, prompt); - disableRawMode(STDIN_FILENO); - printf("\n"); - } - return count; -} - -/* The high level function that is the main API of the linenoise library. - * This function checks if the terminal has basic capabilities, just checking - * for a blacklist of stupid terminals, and later either calls the line - * editing function or uses dummy fgets() so that you will be able to type - * something even in the most desperate of the conditions. */ -char *linenoise(const char *prompt) { - char buf[LINENOISE_MAX_LINE]; - int count; - - if (isUnsupportedTerm()) { - size_t len; - - printf("%s",prompt); - fflush(stdout); - if (fgets(buf,LINENOISE_MAX_LINE,stdin) == NULL) return NULL; - len = strlen(buf); - while(len && (buf[len-1] == '\n' || buf[len-1] == '\r')) { - len--; - buf[len] = '\0'; - } - return strdup(buf); - } else { - count = linenoiseRaw(buf,LINENOISE_MAX_LINE,prompt); - if (count == -1) return NULL; - return strdup(buf); - } -} - -/* ================================ History ================================= */ - -/* Free the history, but does not reset it. Only used when we have to - * exit() to avoid memory leaks are reported by valgrind & co. */ -static void freeHistory(void) { - if (history) { - int j; - - for (j = 0; j < history_len; j++) - free(history[j]); - free(history); - } -} - -/* At exit we'll try to fix the terminal to the initial conditions. */ -static void linenoiseAtExit(void) { - disableRawMode(STDIN_FILENO); - freeHistory(); -} - -/* This is the API call to add a new entry in the linenoise history. - * It uses a fixed array of char pointers that are shifted (memmoved) - * when the history max length is reached in order to remove the older - * entry and make room for the new one, so it is not exactly suitable for huge - * histories, but will work well for a few hundred of entries. - * - * Using a circular buffer is smarter, but a bit more complex to handle. */ -int linenoiseHistoryAdd(const char *line) { - char *linecopy; - - if (history_max_len == 0) return 0; - - /* Initialization on first call. */ - if (history == NULL) { - history = malloc(sizeof(char*)*history_max_len); - if (history == NULL) return 0; - memset(history,0,(sizeof(char*)*history_max_len)); - } - - /* Don't add duplicated lines. */ - if (history_len && !strcmp(history[history_len-1], line)) return 0; - - /* Add an heap allocated copy of the line in the history. - * If we reached the max length, remove the older line. */ - linecopy = strdup(line); - if (!linecopy) return 0; - if (history_len == history_max_len) { - free(history[0]); - memmove(history,history+1,sizeof(char*)*(history_max_len-1)); - history_len--; - } - history[history_len] = linecopy; - history_len++; - return 1; -} - -/* Set the maximum length for the history. This function can be called even - * if there is already some history, the function will make sure to retain - * just the latest 'len' elements if the new history length value is smaller - * than the amount of items already inside the history. */ -int linenoiseHistorySetMaxLen(int len) { - char **new; - - if (len < 1) return 0; - if (history) { - int tocopy = history_len; - - new = malloc(sizeof(char*)*len); - if (new == NULL) return 0; - - /* If we can't copy everything, free the elements we'll not use. */ - if (len < tocopy) { - int j; - - for (j = 0; j < tocopy-len; j++) free(history[j]); - tocopy = len; - } - memset(new,0,sizeof(char*)*len); - memcpy(new,history+(history_len-tocopy), sizeof(char*)*tocopy); - free(history); - history = new; - } - history_max_len = len; - if (history_len > history_max_len) - history_len = history_max_len; - return 1; -} - -/* Save the history in the specified file. On success 0 is returned - * otherwise -1 is returned. */ -int linenoiseHistorySave(const char *filename) { - FILE *fp = fopen(filename,"w"); - int j; - - if (fp == NULL) return -1; - for (j = 0; j < history_len; j++) - fprintf(fp,"%s\n",history[j]); - fclose(fp); - return 0; -} - -/* Load the history from the specified file. If the file does not exist - * zero is returned and no operation is performed. - * - * If the file exists and the operation succeeded 0 is returned, otherwise - * on error -1 is returned. */ -int linenoiseHistoryLoad(const char *filename) { - FILE *fp = fopen(filename,"r"); - char buf[LINENOISE_MAX_LINE]; - - if (fp == NULL) return -1; - - while (fgets(buf,LINENOISE_MAX_LINE,fp) != NULL) { - char *p; - - p = strchr(buf,'\r'); - if (!p) p = strchr(buf,'\n'); - if (p) *p = '\0'; - linenoiseHistoryAdd(buf); - } - fclose(fp); - return 0; -} diff --git a/third_party/src/github.com/GeertJohan/go.linenoise/linenoise.go b/third_party/src/github.com/GeertJohan/go.linenoise/linenoise.go deleted file mode 100644 index 01b5ee156..000000000 --- a/third_party/src/github.com/GeertJohan/go.linenoise/linenoise.go +++ /dev/null @@ -1,142 +0,0 @@ -package linenoise - -// -windows - -// #include -// #include "linenoise.h" -// #include "linenoiseCompletionCallbackHook.h" -import "C" - -import ( - "errors" - "unsafe" -) - -// KillSignalError is returned returned by Line() when a user quits from prompt. -// This occurs when the user enters ctrl+C or ctrl+D. -var KillSignalError = errors.New("prompt was quited with a killsignal") - -func init() { - C.linenoiseSetupCompletionCallbackHook() -} - -// Line displays given string and returns line from user input. -func Line(prompt string) (string, error) { // char *linenoise(const char *prompt); - promptCString := C.CString(prompt) - resultCString := C.linenoise(promptCString) - C.free(unsafe.Pointer(promptCString)) - defer C.free(unsafe.Pointer(resultCString)) - - if resultCString == nil { - return "", KillSignalError - } - - result := C.GoString(resultCString) - - return result, nil -} - -// AddHistory adds a line to history. Returns non-nil error on fail. -func AddHistory(line string) error { // int linenoiseHistoryAdd(const char *line); - lineCString := C.CString(line) - res := C.linenoiseHistoryAdd(lineCString) - C.free(unsafe.Pointer(lineCString)) - if res != 1 { - return errors.New("Could not add line to history.") - } - return nil -} - -// SetHistoryCapacity changes the maximum length of history. Returns non-nil error on fail. -func SetHistoryCapacity(capacity int) error { // int linenoiseHistorySetMaxLen(int len); - res := C.linenoiseHistorySetMaxLen(C.int(capacity)) - if res != 1 { - return errors.New("Could not set history max len.") - } - return nil -} - -// SaveHistory saves from file with given filename. Returns non-nil error on fail. -func SaveHistory(filename string) error { // int linenoiseHistorySave(char *filename); - filenameCString := C.CString(filename) - res := C.linenoiseHistorySave(filenameCString) - C.free(unsafe.Pointer(filenameCString)) - if res != 0 { - return errors.New("Could not save history to file.") - } - return nil -} - -// LoadHistory loads from file with given filename. Returns non-nil error on fail. -func LoadHistory(filename string) error { // int linenoiseHistoryLoad(char *filename); - filenameCString := C.CString(filename) - res := C.linenoiseHistoryLoad(filenameCString) - C.free(unsafe.Pointer(filenameCString)) - if res != 0 { - return errors.New("Could not load history from file.") - } - return nil -} - -// Clear clears the screen. -func Clear() { // void linenoiseClearScreen(void); - C.linenoiseClearScreen() -} - -// SetMultiline sets linenoise to multiline or single line. -// In multiline mode the user input will be wrapped to a new line when the length exceeds the amount of available rows in the terminal. -func SetMultiline(ml bool) { // void linenoiseSetMultiLine(int ml); - if ml { - C.linenoiseSetMultiLine(1) - } else { - C.linenoiseSetMultiLine(0) - } -} - -// CompletionHandler provides possible completions for given input -type CompletionHandler func(input string) []string - -// DefaultCompletionHandler simply returns an empty slice. -var DefaultCompletionHandler = func(input string) []string { - return make([]string, 0) -} - -var complHandler = DefaultCompletionHandler - -// SetCompletionHandler sets the CompletionHandler to be used for completion -func SetCompletionHandler(c CompletionHandler) { - complHandler = c -} - -// typedef struct linenoiseCompletions { -// size_t len; -// char **cvec; -// } linenoiseCompletions; -// typedef void(linenoiseCompletionCallback)(const char *, linenoiseCompletions *); -// void linenoiseSetCompletionCallback(linenoiseCompletionCallback *); -// void linenoiseAddCompletion(linenoiseCompletions *, char *); - -//export linenoiseGoCompletionCallbackHook -func linenoiseGoCompletionCallbackHook(input *C.char, completions *C.linenoiseCompletions) { - completionsSlice := complHandler(C.GoString(input)) - - completionsLen := len(completionsSlice) - completions.len = C.size_t(completionsLen) - - if completionsLen > 0 { - cvec := C.malloc(C.size_t(int(unsafe.Sizeof(*(**C.char)(nil))) * completionsLen)) - cvecSlice := (*(*[999999]*C.char)(cvec))[:completionsLen] - - for i, str := range completionsSlice { - cvecSlice[i] = C.CString(str) - } - completions.cvec = (**C.char)(cvec) - } -} - -// PrintKeyCodes puts linenoise in key codes debugging mode. -// Press keys and key combinations to see key codes. Type 'quit' at any time to exit. -// PrintKeyCodes blocks until user enters 'quit'. -func PrintKeyCodes() { // void linenoisePrintKeyCodes(void); - C.linenoisePrintKeyCodes() -} diff --git a/third_party/src/github.com/GeertJohan/go.linenoise/linenoise.h b/third_party/src/github.com/GeertJohan/go.linenoise/linenoise.h deleted file mode 100644 index 0e8917986..000000000 --- a/third_party/src/github.com/GeertJohan/go.linenoise/linenoise.h +++ /dev/null @@ -1,66 +0,0 @@ -/* linenoise.h -- guerrilla line editing library against the idea that a - * line editing lib needs to be 20,000 lines of C code. - * - * See linenoise.c for more information. - * - * ------------------------------------------------------------------------ - * - * Copyright (c) 2010-2014, Salvatore Sanfilippo - * Copyright (c) 2010-2013, Pieter Noordhuis - * - * 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. - * - * * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef __LINENOISE_H -#define __LINENOISE_H - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct linenoiseCompletions { - size_t len; - char **cvec; -} linenoiseCompletions; - -typedef void(linenoiseCompletionCallback)(const char *, linenoiseCompletions *); -void linenoiseSetCompletionCallback(linenoiseCompletionCallback *); -void linenoiseAddCompletion(linenoiseCompletions *, const char *); - -char *linenoise(const char *prompt); -int linenoiseHistoryAdd(const char *line); -int linenoiseHistorySetMaxLen(int len); -int linenoiseHistorySave(const char *filename); -int linenoiseHistoryLoad(const char *filename); -void linenoiseClearScreen(void); -void linenoiseSetMultiLine(int ml); -void linenoisePrintKeyCodes(void); - -#ifdef __cplusplus -} -#endif - -#endif /* __LINENOISE_H */ diff --git a/third_party/src/github.com/GeertJohan/go.linenoise/linenoiseCompletionCallbackHook.c b/third_party/src/github.com/GeertJohan/go.linenoise/linenoiseCompletionCallbackHook.c deleted file mode 100644 index 7561d22a8..000000000 --- a/third_party/src/github.com/GeertJohan/go.linenoise/linenoiseCompletionCallbackHook.c +++ /dev/null @@ -1,8 +0,0 @@ - -#include "linenoiseCompletionCallbackHook.h" - -extern void linenoiseGoCompletionCallbackHook(const char *, linenoiseCompletions *); - -void linenoiseSetupCompletionCallbackHook() { - linenoiseSetCompletionCallback(linenoiseGoCompletionCallbackHook); -} \ No newline at end of file diff --git a/third_party/src/github.com/GeertJohan/go.linenoise/linenoiseCompletionCallbackHook.h b/third_party/src/github.com/GeertJohan/go.linenoise/linenoiseCompletionCallbackHook.h deleted file mode 100644 index 071170c44..000000000 --- a/third_party/src/github.com/GeertJohan/go.linenoise/linenoiseCompletionCallbackHook.h +++ /dev/null @@ -1,5 +0,0 @@ - -#include -#include "linenoise.h" - -void linenoiseSetupCompletionCallbackHook(); \ No newline at end of file diff --git a/third_party/src/github.com/GeertJohan/go.linenoise/windows.go b/third_party/src/github.com/GeertJohan/go.linenoise/windows.go deleted file mode 100644 index 29178ca9e..000000000 --- a/third_party/src/github.com/GeertJohan/go.linenoise/windows.go +++ /dev/null @@ -1,8 +0,0 @@ -package linenoise - -// #include -// #include "linenoise.h" -import "C" - -// this will break a go build on windows and display the string on console -"go.linenoise does not support windows." \ No newline at end of file