main: give deferred functions a chance to run (fixes -cpuprofile)

rfjakob · rfjakob · commit 80c50b9dbcbf · 2016-11-23T23:49:34.000+01:00
diff --git a/main.go b/main.go
@@ -239,5 +239,10 @@ func main() {
 		tlog.Fatal.Printf("Usage: %s [OPTIONS] CIPHERDIR MOUNTPOINT [-o COMMA-SEPARATED-OPTIONS]", tlog.ProgramName)
 		os.Exit(ErrExitUsage)
 	}
-	os.Exit(doMount(&args))
+	ret := doMount(&args)
+	if ret != 0 {
+		os.Exit(ret)
+	}
+	// Don't call os.Exit on success to give deferred functions a chance to
+	// run
 }

Original file line number	Diff line number	Diff line change
`@@ -239,5 +239,10 @@ func main() {`
`239`	`239`	`tlog.Fatal.Printf("Usage: %s [OPTIONS] CIPHERDIR MOUNTPOINT [-o COMMA-SEPARATED-OPTIONS]", tlog.ProgramName)`
`240`	`240`	`os.Exit(ErrExitUsage)`
`241`	`241`	`}`
`242`		`- os.Exit(doMount(&args))`
	`242`	`+ ret := doMount(&args)`
	`243`	`+ if ret != 0 {`
	`244`	`+ os.Exit(ret)`
	`245`	`+ }`
	`246`	`+ // Don't call os.Exit on success to give deferred functions a chance to`
	`247`	`+ // run`
`243`	`248`	`}`