Add a -f flag to overwrite, and update tests

1 files changed, 24 insertions, 9 deletions

diff --git a/dec/dec.go b/dec/dec.go
index ce0a719..049bc74 100644
--- a/dec/dec.go
+++ b/dec/dec.go
@@ -3,22 +3,34 @@ package main
 import (
 	"flag"
 	"fmt"
+	"io"
 	"os"
 
 	"golang.org/x/term"
 	"roseh.moe/cmd/sym/internal/sym"
 )
 
-var passwordFlag = flag.String("p", "", "use the specified password; if not provided, dec will prompt for a password")
+type options struct {
+	password string
+	force    bool
 
-func dec() error {
-	args := flag.Args()
-	if len(args) == 0 && *passwordFlag == "" {
+	stdin  io.Reader
+	stdout io.Writer
+}
+
+func (o *options) dec(args ...string) error {
+	if o.stdin == nil {
+		o.stdin = os.Stdin
+	}
+	if o.stdout == nil {
+		o.stdout = os.Stdout
+	}
+	if len(args) == 0 && o.password == "" {
 		return fmt.Errorf("-p is required when reading from stdin")
 	}
 	var password string
-	if *passwordFlag != "" {
-		password = *passwordFlag
+	if o.password != "" {
+		password = o.password
 	} else {
 		fmt.Fprint(os.Stderr, "Enter password: ")
 		pw, err := term.ReadPassword(int(os.Stdin.Fd()))
@@ -29,10 +41,10 @@ func dec() error {
 		password = string(pw)
 	}
 	if len(args) == 0 {
-		return sym.Decrypt(os.Stdout, os.Stdin, password)
+		return sym.Decrypt(o.stdout, o.stdin, password)
 	}
 	for _, fileName := range args {
-		if err := sym.DecryptFile(fileName, password); err != nil {
+		if err := sym.DecryptFile(fileName, password, sym.Force(o.force)); err != nil {
 			return err
 		}
 	}
@@ -40,8 +52,11 @@ func dec() error {
 }
 
 func main() {
+	o := new(options)
+	flag.StringVar(&o.password, "p", "", "use the specified password; if not provided, dec will prompt for a password")
+	flag.BoolVar(&o.force, "f", false, "overwrite output files even if they already exist")
 	flag.Parse()
-	if err := dec(); err != nil {
+	if err := o.dec(flag.Args()...); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}