Merge branch 'develop'

[nncp.git] / src / cmd / nncp-log / main.go

diff --git a/src/cmd/nncp-log/main.go b/src/cmd/nncp-log/main.go
index 74062610aa93cb8db189847aa023c86d9617421c..c6bd1205e18fe7b4ede681e8eeaf7db43af203e8 100644 (file)
--- a/src/cmd/nncp-log/main.go
+++ b/src/cmd/nncp-log/main.go
@@ -19,13 +19,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-       "bufio"
        "flag"
        "fmt"
+       "io"
        "log"
        "os"
 
-       "go.cypherpunks.ru/nncp/v5"
+       "go.cypherpunks.ru/nncp/v8"
+       "go.cypherpunks.ru/recfile"
 )
 
 func usage() {
@@ -43,6 +44,7 @@ func main() {
                version  = flag.Bool("version", false, "Print version information")
                warranty = flag.Bool("warranty", false, "Print warranty information")
        )
+       log.SetFlags(log.Lshortfile)
        flag.Usage = usage
        flag.Parse()
        if *warranty {
@@ -63,15 +65,22 @@ func main() {
        if err != nil {
                log.Fatalln("Can not open log:", err)
        }
-       scanner := bufio.NewScanner(fd)
-       for scanner.Scan() {
-               t := scanner.Text()
+       r := recfile.NewReader(fd)
+       for {
+               le, err := r.NextMap()
+               if err != nil {
+                       if err == io.EOF {
+                               break
+                       }
+                       log.Fatalln("Can not read log:", err)
+               }
                if *debug {
-                       fmt.Println(t)
+                       fmt.Println(le)
                }
-               fmt.Println(ctx.Humanize(t))
-       }
-       if err = scanner.Err(); err != nil {
-               log.Fatalln("Can not read log:", err)
+               s, err := ctx.Humanize(le)
+               if err != nil {
+                       s = fmt.Sprintf("Can not humanize: %s\n%s", err, le)
+               }
+               fmt.Println(s)
        }
 }