diff options
| author | Jakob Unterwurzacher | 2016-06-15 23:30:44 +0200 | 
|---|---|---|
| committer | Jakob Unterwurzacher | 2016-06-15 23:30:44 +0200 | 
| commit | 6c3f97399a01a2d8480b39978209099335efbf7d (patch) | |
| tree | 097b34a37b5f62ebcfd7294d096b16f436c180f9 /internal/readpassword | |
| parent | 09e88f31d1b4308bf82c7f4eb0dd83855ad67ffc (diff) | |
Rename internal "toggledlog" package to "tlog"
tlog is used heavily everywhere and deserves a shorter name.
Renamed using sed magic, without any manual rework:
   find * -type f -exec sed -i 's/toggledlog/tlog/g' {} +
Diffstat (limited to 'internal/readpassword')
| -rw-r--r-- | internal/readpassword/extpass_test.go | 4 | ||||
| -rw-r--r-- | internal/readpassword/read.go | 22 | 
2 files changed, 13 insertions, 13 deletions
| diff --git a/internal/readpassword/extpass_test.go b/internal/readpassword/extpass_test.go index 6eda142..cdb800c 100644 --- a/internal/readpassword/extpass_test.go +++ b/internal/readpassword/extpass_test.go @@ -5,12 +5,12 @@ import (  	"os/exec"  	"testing" -	"github.com/rfjakob/gocryptfs/internal/toggledlog" +	"github.com/rfjakob/gocryptfs/internal/tlog"  )  func TestMain(m *testing.M) {  	// Shut up info output -	toggledlog.Info.Enabled = false +	tlog.Info.Enabled = false  	m.Run()  } diff --git a/internal/readpassword/read.go b/internal/readpassword/read.go index 1f2a9fa..2c0bce3 100644 --- a/internal/readpassword/read.go +++ b/internal/readpassword/read.go @@ -9,7 +9,7 @@ import (  	"golang.org/x/crypto/ssh/terminal" -	"github.com/rfjakob/gocryptfs/internal/toggledlog" +	"github.com/rfjakob/gocryptfs/internal/tlog"  )  const ( @@ -40,7 +40,7 @@ func Twice(extpass string) string {  	p1 := readPasswordTerminal("Password: ")  	p2 := readPasswordTerminal("Repeat: ")  	if p1 != p2 { -		toggledlog.Fatal.Println("Passwords do not match") +		tlog.Fatal.Println("Passwords do not match")  		os.Exit(exitCode)  	}  	return p1 @@ -54,12 +54,12 @@ func readPasswordTerminal(prompt string) string {  	// terminal.ReadPassword removes the trailing newline  	p, err := terminal.ReadPassword(fd)  	if err != nil { -		toggledlog.Fatal.Printf("Could not read password from terminal: %v\n", err) +		tlog.Fatal.Printf("Could not read password from terminal: %v\n", err)  		os.Exit(exitCode)  	}  	fmt.Fprintf(os.Stderr, "\n")  	if len(p) == 0 { -		toggledlog.Fatal.Println("Password is empty") +		tlog.Fatal.Println("Password is empty")  		os.Exit(exitCode)  	}  	return string(p) @@ -68,11 +68,11 @@ func readPasswordTerminal(prompt string) string {  // readPasswordStdin reads a line from stdin  // Exits on read error or empty result.  func readPasswordStdin() string { -	toggledlog.Info.Println("Reading password from stdin") +	tlog.Info.Println("Reading password from stdin")  	p := readLineUnbuffered(os.Stdin)  	if len(p) == 0 {  		fmt.Fprintf(os.Stderr, "FOOOOOO\n") -		toggledlog.Fatal.Println("Got empty password from stdin") +		tlog.Fatal.Println("Got empty password from stdin")  		os.Exit(exitCode)  	}  	return p @@ -82,25 +82,25 @@ func readPasswordStdin() string {  // of the output.  // Exits on read error or empty result.  func readPasswordExtpass(extpass string) string { -	toggledlog.Info.Println("Reading password from extpass program") +	tlog.Info.Println("Reading password from extpass program")  	parts := strings.Split(extpass, " ")  	cmd := exec.Command(parts[0], parts[1:]...)  	cmd.Stderr = os.Stderr  	pipe, err := cmd.StdoutPipe()  	if err != nil { -		toggledlog.Fatal.Printf("extpass pipe setup failed: %v", err) +		tlog.Fatal.Printf("extpass pipe setup failed: %v", err)  		os.Exit(exitCode)  	}  	err = cmd.Start()  	if err != nil { -		toggledlog.Fatal.Printf("extpass cmd start failed: %v", err) +		tlog.Fatal.Printf("extpass cmd start failed: %v", err)  		os.Exit(exitCode)  	}  	p := readLineUnbuffered(pipe)  	pipe.Close()  	cmd.Wait()  	if len(p) == 0 { -		toggledlog.Fatal.Println("extpass: password is empty") +		tlog.Fatal.Println("extpass: password is empty")  		os.Exit(exitCode)  	}  	return p @@ -116,7 +116,7 @@ func readLineUnbuffered(r io.Reader) (l string) {  			return l  		}  		if err != nil { -			toggledlog.Fatal.Printf("readLineUnbuffered: %v", err) +			tlog.Fatal.Printf("readLineUnbuffered: %v", err)  			os.Exit(exitCode)  		}  		if n == 0 { | 
