From 75435e5cd757bcca846a22fa7170773f37d3da40 Mon Sep 17 00:00:00 2001 From: taknb2nch Date: Mon, 7 Apr 2014 11:18:17 +0900 Subject: [PATCH] fixed bug/issue #1 fixed parseResponse --- pop3proto.go | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pop3proto.go b/pop3proto.go index a2a4c02..ac972c0 100644 --- a/pop3proto.go +++ b/pop3proto.go @@ -110,31 +110,16 @@ func (r *Reader) ReadResponse() (string, error) { } func (r *Reader) parseResponse(line string) (string, error) { - // var index int - - // if index = strings.Index(line, " "); index < 0 { - // return "", ResponseError(fmt.Sprintf("invalid response format: %s", line)) - // } - - // switch strings.ToUpper(line[:index]) { - // case "+OK": - // return line[index+1:], nil - // case "-ERR": - // return "", ResponseError(line[index+1:]) - // default: - // return "", ResponseError(fmt.Sprintf("unknown response: %s", line)) - // } - s := strings.ToUpper(line) if s == "+OK" { return "", nil } else if strings.HasPrefix(s, "+OK ") { - return s[4:], nil + return line[4:], nil } else if s == "-ERR" { return "", ResponseError("") } else if strings.HasPrefix(s, "-ERR ") { - return "", ResponseError(s[5:]) + return "", ResponseError(line[5:]) } else { return "", ResponseError(fmt.Sprintf("unknown response: %s", line)) }