zfs-diff appends / to dataset roots

[glocate.git] / diff.go

diff --git a/diff.go b/diff.go
index 61ba1ac9f83e9f80cb3ac2a7b81e88079e1e9a2d3a8e8afabd34f0485b739d9f..be79911b777e14b1857fe35a74639400adbbdb1a91a80884fcf0640ce71a5d78 100644 (file)
--- a/diff.go
+++ b/diff.go
@@ -61,6 +61,7 @@ func updateWithDiff(dbPath, strip string) *os.File {
                }
                isDir = cols[1] == "/"
                name := deoctalize(strings.TrimPrefix(cols[2], strip))
+               name = strings.TrimRight(name, "/")
                if name == "" {
                        continue
                }
@@ -105,7 +106,7 @@ func updateWithDiff(dbPath, strip string) *os.File {
        mods := make([]*Ent, 0, len(modsNames)+len(rens))
        if len(rens) > 0 {
                sort.Sort(BySrc(rens))
-               go reader(bufio.NewReaderSize(db, 1<<17), entsReader)
+               go reader(db, entsReader)
                var ent Ent
                var ok, met bool
                for {
@@ -175,7 +176,7 @@ func updateWithDiff(dbPath, strip string) *os.File {
        if err != nil {
                log.Fatalln(err)
        }
-       tmp0, err := os.CreateTemp("", "glocate-idx")
+       tmp0, err := os.CreateTemp(TmpDir, "glocate-idx")
        if err != nil {
                log.Fatalln(err)
        }
@@ -183,7 +184,7 @@ func updateWithDiff(dbPath, strip string) *os.File {
        entsReader = make(chan Ent, 1<<10)
        entsDirSizer := make(chan Ent, 1<<10)
        entsWriter := make(chan Ent, 1<<10)
-       go reader(bufio.NewReaderSize(db, 1<<17), entsReader)
+       go reader(db, entsReader)
 
        dirSizerJob := make(chan struct{})
        var dirSizes []int64
@@ -193,10 +194,9 @@ func updateWithDiff(dbPath, strip string) *os.File {
                close(dirSizerJob)
        }()
 
-       bw := bufio.NewWriterSize(tmp0, 1<<17)
        writerJob := make(chan struct{})
        go func() {
-               writer(bw, entsWriter)
+               writer(tmp0, entsWriter)
                close(writerJob)
        }()
 
@@ -243,9 +243,6 @@ func updateWithDiff(dbPath, strip string) *os.File {
        <-dirSizerJob
        close(entsWriter)
        <-writerJob
-       if err = bw.Flush(); err != nil {
-               log.Fatalln(err)
-       }
 
        tmp1 := applyDirSizes(tmp0, dirSizes)
        tmp0.Close()