moji.ToLF() always return nil (replace the original string directly) #72

Author: azumakuniyuki

libsisimai.go

@@ -80,8 +80,7 @@ func Rise(path string, args *sis.DecodingArgs) (*[]sis.Fact, *[]sis.NotDecoded)
 				notdecoded = append(notdecoded, ce)
 				continue
 			}
-			mesg = moji.ToLF(mesg)
-			fact, nyaan := sisifact.Rise(mesg, emailthing.Path, args)
+			moji.ToLF(mesg); fact, nyaan := sisifact.Rise(mesg, emailthing.Path, args)
 			if len(fact)  > 0 { sisidigest = append(sisidigest, fact...)  }
 			if len(nyaan) > 0 { notdecoded = append(notdecoded, nyaan...) }
 

message/rise.go

@@ -30,7 +30,7 @@ var boundaries = []string{"Content-Type: message/rfc822", "Content-Type: text/rf
 func Rise(mesg *string, hook sis.CfParameter0) *sis.BeforeFact {
 	if mesg == nil || len(*mesg) < 1 { return new(sis.BeforeFact) }
 
-	mesg        = moji.ToLF(mesg)
+	moji.ToLF(mesg)
 	retryagain := 0
 	beforefact := new(sis.BeforeFact)
 

message/sift.go

@@ -62,7 +62,7 @@ func sift(bf *sis.BeforeFact, hook sis.CfParameter0) bool {
 		if cv != nil                { bf.Payload = *cv                      }
 		if fe != nil && len(fe) > 0 { bf.Errors  = append(bf.Errors, fe...) }
 	}
-	bf.Payload  = *(moji.ToLF(&bf.Payload))
+	moji.ToLF(&bf.Payload)
 	bf.Payload  = strings.ReplaceAll(bf.Payload, "\t", " ") // Replace all the TAB with " "
 
 	if hook != nil {

moji/11-tolf_test.go

@@ -19,12 +19,12 @@ func TestToLF(t *testing.T) {
 		"nekochan\rcats\rkijitora\r\r",
 	}
 	for _, e := range cw {
-		cv := ToLF(&e);
-		cx++; if strings.Contains(*cv, "\r\n") == true { t.Errorf("%s(%s) contains CRLF", fn, *cv) }
-		cx++; if strings.Contains(*cv, "\r")   == true { t.Errorf("%s(%s) contains CR",   fn, *cv) }
+		ToLF(&e);
+		cx++; if strings.Contains(e, "\r\n") == true { t.Errorf("%s(%s) contains CRLF", fn, e) }
+		cx++; if strings.Contains(e, "\r")   == true { t.Errorf("%s(%s) contains CR",   fn, e) }
 	}
 	ce := "";
-	cx++; if cv := ToLF(&ce); *cv != "" { t.Errorf("%s() returns %s", fn, *cv) }
+	cx++; if ToLF(&ce); ce != "" { t.Errorf("%s() returns %s", fn, ce) }
 
 	t.Logf("The number of tests = %d", cx)
 }

moji/to-something.go

@@ -14,15 +14,28 @@ import "strings"
 //   Arguments:
 //     - argv0 (*string): Text including CR or CR/LF
 //   Returns:
-//     - (*string):       LF converted text
+//     - (error):         Always nil
 func ToLF(argv0 *string) *string {
-	if argv0 == nil || *argv0 == "" { return argv0 }
+	if argv0 == nil || *argv0 == "" || strings.IndexByte(*argv0, '\r') < 0 { return nil }
+
+	readbuffer := []byte(*argv0)
+	tolinefeed := make([]byte, 0, len(readbuffer))
+	bytelength := len(readbuffer)
+
+	for j := 0; j < bytelength; j++ {
+		// Replace '\r' and '\r\n' with '\n'
+		if readbuffer[j] != '\r' { tolinefeed = append(tolinefeed, readbuffer[j]); continue }
+		if j + 1 < bytelength && readbuffer[j + 1] == '\n' {
+			// The next character is not the last character, and the next character is '\n'
+			tolinefeed = append(tolinefeed, '\n'); j++
 
-	for _, e := range [2]string{"\r\n", "\r"} {
-		// Convert CRLF and CR to LF
-		if strings.Contains(*argv0, e) { *argv0 = strings.ReplaceAll(*argv0, e, "\n") }
+		} else {
+			// The next character is the last character, or the next character is not '\n'
+			tolinefeed = append(tolinefeed, '\n')
+		}
 	}
-	return argv0
+	*argv0 = string(tolinefeed)
+	return nil
 }
 
 // ToPlain converts given HTML text to a plain text.

rfc2045/make-multipart-flat.go

@@ -55,7 +55,7 @@ func haircut(block *string, heads bool) []string {
 			if len(headerpart[0]) > 0 {
 				// Append parameters
 				headerpart[0] += " " + e
-				headerpart[0]  = moji.Squeeze(headerpart[0], ' ')
+				moji.Squeeze(&headerpart[0], ' ')
 			}
 		}
 	}
@@ -235,7 +235,7 @@ func MakeFlat(argv0 string, argv1 *string) (*string, []sis.NotDecoded) {
 			if len(bodystring) == 0 { continue }
 
 			// The new-line code in the converted string is CRLF
-			if strings.Contains(bodystring, "\r\n") { bodystring = *moji.ToLF(&bodystring) }
+			moji.ToLF(&bodystring)
 
 		} else {
 			// There is no Content-Transfer-Encoding header in the part