Close tmpfiles earlier (ref #2)

build.sh

@@ -18,8 +18,22 @@ for goos in darwin linux freebsd ; do
 		&& cp syncthing "build/$name" \
 		&& cp README.md LICENSE "$name" \
 		&& mv syncthing "$name" \
-		&& tar zcf "$name.tar.gz" "$name" \
-		&& rm -r  "$name" \
-		&& mv "$name.tar.gz" build
+		&& tar zcf "build/$name.tar.gz" "$name" \
+		&& rm -r  "$name"
+	done
+done
+
+for goos in windows ; do
+	for goarch in amd64 386 ; do
+		echo "$goos-$goarch"
+		export GOOS="$goos"
+		export GOARCH="$goarch"
+		export name="syncthing-$goos-$goarch"
+		go build -ldflags "-X main.Version $version" \
+		&& mkdir -p "$name" \
+		&& cp syncthing.exe "build/$name.exe" \
+		&& cp README.md LICENSE "$name" \
+		&& zip -qr "build/$name.zip" "$name" \
+		&& rm -r  "$name"
 	done
 done

main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"compress/gzip"
 	"crypto/sha1"
 	"crypto/tls"
 	"fmt"
@@ -25,6 +26,7 @@ type Options struct {
 	Listen     string           `short:"l" long:"listen" description:"Listen address" default:":22000" value-name:"ADDR"`
 	ReadOnly   bool             `short:"r" long:"ro" description:"Repository is read only"`
 	Delete     bool             `short:"d" long:"delete" description:"Delete files deleted from cluster"`
+	Rehash     bool             `long:"rehash" description:"Ignore cache and rehash all files in repository"`
 	NoSymlinks bool             `long:"no-symlinks" description:"Don't follow first level symlinks in the repo"`
 	Discovery  DiscoveryOptions `group:"Discovery Options"`
 	Advanced   AdvancedOptions  `group:"Advanced Options"`
@@ -66,11 +68,6 @@ var (
 	nodeAddrs = make(map[string][]string)
 )
 
-// Options
-var (
-	ConfDir = path.Join(getHomeDir(), confDirName)
-)
-
 func main() {
 	_, err := flags.Parse(&opts)
 	if err != nil {
@@ -87,11 +84,11 @@ func main() {
 
 	// Ensure that our home directory exists and that we have a certificate and key.
 
-	ensureDir(ConfDir, 0700)
-	cert, err := loadCert(ConfDir)
+	ensureDir(opts.ConfDir, 0700)
+	cert, err := loadCert(opts.ConfDir)
 	if err != nil {
-		newCertificate(ConfDir)
-		cert, err = loadCert(ConfDir)
+		newCertificate(opts.ConfDir)
+		cert, err = loadCert(opts.ConfDir)
 		fatalErr(err)
 	}
 
@@ -120,7 +117,7 @@ func main() {
 
 	// Load the configuration file, if it exists.
 
-	cf, err := os.Open(path.Join(ConfDir, confFileName))
+	cf, err := os.Open(path.Join(opts.ConfDir, confFileName))
 	if err != nil {
 		fatalln("No config file")
 		config = ini.Config{}
@@ -144,8 +141,11 @@ func main() {
 	// Walk the repository and update the local model before establishing any
 	// connections to other nodes.
 
-	infoln("Initial repository scan in progress")
-	loadIndex(m)
+	if !opts.Rehash {
+		infoln("Loading index cache")
+		loadIndex(m)
+	}
+	infoln("Populating repository index")
 	updateLocalModel(m)
 
 	// Routine to listen for incoming connections
@@ -300,26 +300,36 @@ func updateLocalModel(m *Model) {
 }
 
 func saveIndex(m *Model) {
-	name := fmt.Sprintf("%x.idx", sha1.Sum([]byte(m.Dir())))
-	fullName := path.Join(ConfDir, name)
+	name := fmt.Sprintf("%x.idx.gz", sha1.Sum([]byte(m.Dir())))
+	fullName := path.Join(opts.ConfDir, name)
 	idxf, err := os.Create(fullName + ".tmp")
 	if err != nil {
 		return
 	}
-	protocol.WriteIndex(idxf, m.ProtocolIndex())
+
+	gzw := gzip.NewWriter(idxf)
+
+	protocol.WriteIndex(gzw, m.ProtocolIndex())
+	gzw.Close()
 	idxf.Close()
 	os.Rename(fullName+".tmp", fullName)
 }
 
 func loadIndex(m *Model) {
-	fname := fmt.Sprintf("%x.idx", sha1.Sum([]byte(m.Dir())))
-	idxf, err := os.Open(path.Join(ConfDir, fname))
+	fname := fmt.Sprintf("%x.idx.gz", sha1.Sum([]byte(m.Dir())))
+	idxf, err := os.Open(path.Join(opts.ConfDir, fname))
 	if err != nil {
 		return
 	}
 	defer idxf.Close()
 
-	idx, err := protocol.ReadIndex(idxf)
+	gzr, err := gzip.NewReader(idxf)
+	if err != nil {
+		return
+	}
+	defer gzr.Close()
+
+	idx, err := protocol.ReadIndex(gzr)
 	if err != nil {
 		return
 	}

model_puller.go

@@ -50,13 +50,13 @@ func (m *Model) pullFile(name string) error {
 	if err != nil {
 		return err
 	}
-	defer tmpFile.Close()
 
 	contentChan := make(chan content, 32)
 	var applyDone sync.WaitGroup
 	applyDone.Add(1)
 	go func() {
 		applyContent(contentChan, tmpFile)
+		tmpFile.Close()
 		applyDone.Done()
 	}()
 
@@ -196,10 +196,10 @@ func applyContent(cc <-chan content, dst io.WriterAt) error {
 
 	for c := range cc {
 		_, err = dst.WriteAt(c.data, c.offset)
+		buffers.Put(c.data)
 		if err != nil {
 			return err
 		}
-		buffers.Put(c.data)
 	}
 
 	return nil