From ad1410410bbe22fbab98c2418b9efce307fe70bc Mon Sep 17 00:00:00 2001 From: Justin Reichardt Date: Thu, 9 Dec 2021 15:12:44 -0600 Subject: [PATCH] Moved config parsing to a seperate function This will allow for easier looping later on when this can be run as a daemon --- src/rhosts.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/rhosts.go b/src/rhosts.go index 811dcd9..9d7d5e0 100644 --- a/src/rhosts.go +++ b/src/rhosts.go @@ -53,24 +53,28 @@ func main() { } // Parse Config + cfgparse(cfgloc) + +} + +func cfgparse (cfgloc string){ log.Print("Opening: ", cfgloc) - cfgf, err := os.Open(cfgloc) - defer cfgf.Close() + file, err := os.Open(cfgloc) + defer file.Close() if err != nil { log.Fatal(err) } - cfgfb := bufio.NewScanner(cfgf) - cfgfb.Split(bufio.ScanLines) - for res := cfgfb.Scan();res;res = cfgfb.Scan() { - state, body := cfgparseline(cfgfb.Text()) + filebuf := bufio.NewScanner(file) + filebuf.Split(bufio.ScanLines) + for res := filebuf.Scan();res;res = filebuf.Scan() { + state, body := cfgparseline(filebuf.Text()) log.Print(state, body) } - err = cfgfb.Err() + err = filebuf.Err() if err != nil { log.Fatal(err) } } - func cfgparseline(buf string) (uint8, string){ // State options // 0 - Init