nsscash: return error instead of calling log.Fatal()

[nsscash/nsscash.git] / main.go

diff --git a/main.go b/main.go
index 7a8755cac1df9d5cd4ffd2ff259b2e15c4e95b07..0dd00294634b1759fa9bc8a59bfeeea79cffd39e 100644 (file)
--- a/main.go
+++ b/main.go
@@ -49,38 +49,60 @@ func main() {
                        break
                }
 
-               cfg, err := LoadConfig(args[1])
+               err := mainFetch(args[1])
                if err != nil {
                        log.Fatal(err)
                }
-               state, err := LoadState(cfg.StatePath)
+               return
+
+       case "convert":
+               if len(args) != 4 {
+                       break
+               }
+
+               err := mainConvert(args[1], args[2], args[3])
                if err != nil {
                        log.Fatal(err)
                }
-               err = handleFiles(cfg, state)
+               return
+       }
+
+       flag.Usage()
+       os.Exit(1)
+}
+
+func mainFetch(cfgPath string) error {
+               cfg, err := LoadConfig(cfgPath)
                if err != nil {
-                       log.Fatal(err)
+                       return err
                }
-               err = WriteStateIfChanged(cfg.StatePath, state)
+               state, err := LoadState(cfg.StatePath)
                if err != nil {
-                       log.Fatal(err)
+                       return err
                }
-               return
-
-       case "convert":
-               if len(args) != 4 {
-                       break
+               err = handleFiles(cfg, state)
+               if err != nil {
+                       return err
                }
+               // NOTE: Make sure to call WriteState() only if there were no
+               // errors (see WriteState() and README)
+               err = WriteState(cfg.StatePath, state)
+               if err != nil {
+                       return err
+               }
+               return nil
+}
 
+func mainConvert(typ, srcPath, dstPath string) error {
                var t FileType
-               err := t.UnmarshalText([]byte(args[1]))
+               err := t.UnmarshalText([]byte(typ))
                if err != nil {
-                       log.Fatal(err)
+                       return err
                }
 
-               src, err := ioutil.ReadFile(args[2])
+               src, err := ioutil.ReadFile(srcPath)
                if err != nil {
-                       log.Fatal(err)
+                       return err
                }
                var x bytes.Buffer
                if t == FileTypePlain {
@@ -88,35 +110,40 @@ func main() {
                } else if t == FileTypePasswd {
                        pws, err := ParsePasswds(bytes.NewReader(src))
                        if err != nil {
-                               log.Fatal(err)
+                               return err
                        }
                        err = SerializePasswds(&x, pws)
                        if err != nil {
-                               log.Fatal(err)
+                               return err
+                       }
+               } else if t == FileTypeGroup {
+                       grs, err := ParseGroups(bytes.NewReader(src))
+                       if err != nil {
+                               return err
+                       }
+                       err = SerializeGroups(&x, grs)
+                       if err != nil {
+                               return err
                        }
                } else {
-                       log.Fatalf("unsupported file type %v", t)
+                       return fmt.Errorf("unsupported file type %v", t)
                }
 
                // We must create the file first or deployFile() will abort
-               f, err := os.Create(args[3])
+               f, err := os.Create(dstPath)
                if err != nil {
-                       log.Fatal(err)
+                       return err
                }
                f.Close()
 
                err = deployFile(&File{
                        Type: t,
-                       Url:  args[2],
-                       Path: args[3],
+                       Url:  srcPath,
+                       Path: dstPath,
                        body: x.Bytes(),
                })
                if err != nil {
-                       log.Fatal(err)
+                       return err
                }
-               return
-       }
-
-       flag.Usage()
-       os.Exit(1)
+               return nil
 }