Update vendor/

This commit is contained in:
2018-06-25 23:27:32 +01:00
parent 4f5e3ed906
commit d25ed6c1bd
182 changed files with 31368 additions and 6047 deletions

View File

@@ -2,7 +2,6 @@ package smtp
import (
"fmt"
"regexp"
"strings"
)
@@ -40,18 +39,19 @@ func parseCmd(line string) (cmd string, arg string, err error) {
// string:
// " BODY=8BITMIME SIZE=1024"
// The leading space is mandatory.
func parseArgs(arg string) (args map[string]string, err error) {
args = map[string]string{}
re := regexp.MustCompile(" (\\w+)=(\\w+)")
pm := re.FindAllStringSubmatch(arg, -1)
if pm == nil {
return nil, fmt.Errorf("Failed to parse arg string: %q", arg)
func parseArgs(args []string) (map[string]string, error) {
argMap := map[string]string{}
for _, arg := range args {
if arg == "" {
continue
}
m := strings.Split(arg, "=")
if len(m) != 2 {
return nil, fmt.Errorf("Failed to parse arg string: %q", arg)
}
argMap[strings.ToUpper(m[0])] = m[1]
}
for _, m := range pm {
args[strings.ToUpper(m[1])] = m[2]
}
return args, nil
return argMap, nil
}
func parseHelloArgument(arg string) (string, error) {