summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2017-12-12 13:43:21 -0600
committerAtomic Bot <atomic-devel@projectatomic.io>2017-12-14 22:22:56 +0000
commitbbe6b21cb802737f933305f7c2013a86349ba43c (patch)
tree0eceedf34c7ad7f448019a075b1899af85bb711a
parentd2ab53aa5f67cb65a75f2c36fb076c0debd961ca (diff)
downloadpodman-bbe6b21cb802737f933305f7c2013a86349ba43c.tar.gz
podman-bbe6b21cb802737f933305f7c2013a86349ba43c.tar.bz2
podman-bbe6b21cb802737f933305f7c2013a86349ba43c.zip
Vendor in latest urfave/cli
Containers bug fixes for urfave/cli flag parsing Signed-off-by: baude <bbaude@redhat.com> Closes: #121 Approved by: rhatdan
-rw-r--r--vendor.conf2
-rw-r--r--vendor/github.com/urfave/cli/command.go134
2 files changed, 53 insertions, 83 deletions
diff --git a/vendor.conf b/vendor.conf
index 8f4db8302..cc335f7ea 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -66,7 +66,7 @@ github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46
github.com/emicklei/go-restful-swagger12 1.0.1
github.com/pkg/errors v0.8.0
github.com/godbus/dbus a389bdde4dd695d414e47b755e95e72b7826432c
-github.com/urfave/cli 119bb6564841921ce6f1401e0f5d75317bdd9f4d
+github.com/urfave/cli 39908eb08fee7c10d842622a114a5c133fb0a3c6
github.com/vbatts/tar-split v0.10.2
github.com/renstrom/dedent v1.0.0
github.com/hpcloud/tail v1.0.0
diff --git a/vendor/github.com/urfave/cli/command.go b/vendor/github.com/urfave/cli/command.go
index 7d0357bd0..66a58b5a8 100644
--- a/vendor/github.com/urfave/cli/command.go
+++ b/vendor/github.com/urfave/cli/command.go
@@ -1,6 +1,7 @@
package cli
import (
+ "flag"
"fmt"
"io/ioutil"
"sort"
@@ -110,43 +111,7 @@ func (c Command) Run(ctx *Context) (err error) {
)
}
- set, err := flagSet(c.Name, c.Flags)
- if err != nil {
- return err
- }
- set.SetOutput(ioutil.Discard)
- firstFlagIndex, terminatorIndex := getIndexes(ctx)
- flagArgs, regularArgs := getAllArgs(ctx.Args(), firstFlagIndex, terminatorIndex)
- if c.UseShortOptionHandling {
- flagArgs = translateShortOptions(flagArgs)
- }
- if c.SkipFlagParsing {
- err = set.Parse(append([]string{"--"}, ctx.Args().Tail()...))
- } else if !c.SkipArgReorder {
- if firstFlagIndex > -1 {
- err = set.Parse(append(flagArgs, regularArgs...))
- } else {
- err = set.Parse(ctx.Args().Tail())
- }
- } else if c.UseShortOptionHandling {
- if terminatorIndex == -1 && firstFlagIndex > -1 {
- // Handle shortname AND no options
- err = set.Parse(append(regularArgs, flagArgs...))
- } else {
- // Handle shortname and options
- err = set.Parse(flagArgs)
- }
- } else {
- err = set.Parse(append(regularArgs, flagArgs...))
- }
-
- nerr := normalizeFlags(c.Flags, set)
- if nerr != nil {
- fmt.Fprintln(ctx.App.Writer, nerr)
- fmt.Fprintln(ctx.App.Writer)
- ShowCommandHelp(ctx, c.Name)
- return nerr
- }
+ set, err := c.parseFlags(ctx.Args().Tail())
context := NewContext(ctx.App, set, ctx)
context.Command = c
@@ -205,60 +170,65 @@ func (c Command) Run(ctx *Context) (err error) {
return err
}
-func getIndexes(ctx *Context) (int, int) {
- firstFlagIndex := -1
- terminatorIndex := -1
- for index, arg := range ctx.Args() {
- if arg == "--" {
- terminatorIndex = index
- break
- } else if arg == "-" {
- // Do nothing. A dash alone is not really a flag.
- continue
- } else if strings.HasPrefix(arg, "-") && firstFlagIndex == -1 {
- firstFlagIndex = index
- }
+func (c *Command) parseFlags(args Args) (*flag.FlagSet, error) {
+ set, err := flagSet(c.Name, c.Flags)
+ if err != nil {
+ return nil, err
}
- if len(ctx.Args()) > 0 && !strings.HasPrefix(ctx.Args()[0], "-") && firstFlagIndex == -1 {
- return -1, -1
+ set.SetOutput(ioutil.Discard)
+
+ if c.SkipFlagParsing {
+ return set, set.Parse(append([]string{c.Name, "--"}, args...))
}
- return firstFlagIndex, terminatorIndex
+ if c.UseShortOptionHandling {
+ args = translateShortOptions(args)
+ }
-}
+ if !c.SkipArgReorder {
+ args = reorderArgs(args)
+ }
-// copyStringslice takes a string slice and copies it
-func copyStringSlice(slice []string, start, end int) []string {
- newSlice := make([]string, end-start)
- copy(newSlice, slice[start:end])
- return newSlice
-}
+ err = set.Parse(args)
+ if err != nil {
+ return nil, err
+ }
-// getAllArgs extracts and returns two string slices representing
-// regularArgs and flagArgs
-func getAllArgs(args []string, firstFlagIndex, terminatorIndex int) ([]string, []string) {
- var regularArgs []string
- // if there are no options, the we set the index to 1 manually
- if firstFlagIndex == -1 {
- firstFlagIndex = 1
- regularArgs = copyStringSlice(args, 0, len(args))
- } else {
- regularArgs = copyStringSlice(args, 1, firstFlagIndex)
+ err = normalizeFlags(c.Flags, set)
+ if err != nil {
+ return nil, err
}
- var flagArgs []string
- // a flag terminatorIndex was found in the input. we need to collect
- // flagArgs based on it.
- if terminatorIndex > -1 {
- flagArgs = copyStringSlice(args, firstFlagIndex, terminatorIndex)
- additionalRegularArgs := copyStringSlice(args, terminatorIndex, len(args))
- regularArgs = append(regularArgs, additionalRegularArgs...)
- for _, i := range additionalRegularArgs {
- regularArgs = append(regularArgs, i)
+
+ return set, nil
+}
+
+// reorderArgs moves all flags before arguments as this is what flag expects
+func reorderArgs(args []string) []string {
+ var nonflags, flags []string
+
+ readFlagValue := false
+ for i, arg := range args {
+ if arg == "--" {
+ nonflags = append(nonflags, args[i:]...)
+ break
+ }
+
+ if readFlagValue {
+ readFlagValue = false
+ flags = append(flags, arg)
+ continue
+ }
+
+ if arg != "-" && strings.HasPrefix(arg, "-") {
+ flags = append(flags, arg)
+
+ readFlagValue = !strings.Contains(arg, "=")
+ } else {
+ nonflags = append(nonflags, arg)
}
- } else {
- flagArgs = args[firstFlagIndex:]
}
- return flagArgs, regularArgs
+
+ return append(flags, nonflags...)
}
func translateShortOptions(flagArgs Args) []string {