Changeset 503 in code for trunk/cmd

Timestamp:

Apr 19, 2021, 12:11:25 PM (4 years ago)

Author:

contact

Message:

sojuctl: don't use log.Fatalf in readPassword

File:

• trunk/cmd/sojuctl/main.go (modified) (2 diffs)

trunk/cmd/sojuctl/main.go

@@ -5 +5 @@
         "flag"
         "fmt"
+        "io"
         "log"
         "os"
@@ -126 +127 @@
         } else {
                 fmt.Fprintf(os.Stderr, "Warning: Reading password from stdin.\n")
+                // TODO: the buffering messes up repeated calls to readPassword
                 scanner := bufio.NewScanner(os.Stdin)
                 if !scanner.Scan() {
                         if err := scanner.Err(); err != nil {
-                                log.Fatalf("failed to read password from stdin: %v", err)
+                                return nil, err
                         }
-                        log.Fatalf("failed to read password from stdin: stdin is empty")
+                        return nil, io.ErrUnexpectedEOF
                 }
                 password = scanner.Bytes()