commands/http: Cleaned up argument handling in Parse

f13e1fed · Matt Bell · Juan Batiz-Benet · 065a3021 · f13e1fed
Commit f13e1fed authored Nov 04, 2014 by Matt Bell Committed by Juan Batiz-Benet Nov 04, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

http/parse.go http/parse.go +9 -1

No files found.
--- a/http/parse.go
+++ b/http/parse.go
@@ -45,9 +45,17 @@ func Parse(r *http.Request, root *cmds.Command) (cmds.Request, error) {

 	for _, arg := range cmd.Arguments {
 		if arg.Type == cmds.ArgString {
-			for j := 0; len(stringArgs) > 0 && arg.Variadic || j == 0; j++ {
+			if arg.Variadic {
+				for _, s := range stringArgs {
+					args = append(args, s)
+				}
+
+			} else if len(stringArgs) > 0 {
 				args = append(args, stringArgs[0])
 				stringArgs = stringArgs[1:]
+
+			} else {
+				break
 			}

 		} else {