Move main into the right location; fix a lot of channel messages.

src/irc/net.go

@@ -2,31 +2,29 @@ package irc
 
 import (
 	"bufio"
-	"log"
 	"net"
 	"strings"
 )
 
 func readTrimmedLine(reader *bufio.Reader) (string, error) {
 	line, err := reader.ReadString('\n')
-	return strings.TrimSpace(line), err
+	if err != nil {
+		return "", err
+	}
+	return strings.TrimSpace(line), nil
 }
 
 // Adapt `net.Conn` to a `chan string`.
 func StringReadChan(conn net.Conn) <-chan string {
 	ch := make(chan string)
 	reader := bufio.NewReader(conn)
-	addr := conn.RemoteAddr()
 	go func() {
 		for {
 			line, err := readTrimmedLine(reader)
-			if line != "" {
-				ch <- line
-				log.Printf("%s -> %s", addr, line)
-			}
 			if err != nil {
 				break
 			}
+			ch <- line
 		}
 		close(ch)
 	}()
@@ -36,14 +34,12 @@ func StringReadChan(conn net.Conn) <-chan string {
 func StringWriteChan(conn net.Conn) chan<- string {
 	ch := make(chan string)
 	writer := bufio.NewWriter(conn)
-	addr := conn.RemoteAddr()
 	go func() {
 		for str := range ch {
-			if _, err := writer.WriteString(str + "\r\n"); err != nil {
+			if _, err := writer.WriteString(str); err != nil {
 				break
 			}
 			writer.Flush()
-			log.Printf("%s <- %s", addr, str)
 		}
 		close(ch)
 	}()