From 57fb2f7b992a106897d591be46878b9b34d48bcd Mon Sep 17 00:00:00 2001
From: Bandie <bandie@chaospott.de>
Date: Sat, 2 May 2020 20:24:16 +0200
Subject: [PATCH] Using actual ConfigParser call; dingd has -c for config file

---
 ding  |  2 +-
 dingd | 28 +++++++++++++++++++---------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/ding b/ding
index ef1385d..96e2e58 100755
--- a/ding
+++ b/ding
@@ -21,7 +21,7 @@ def readConfig():
   else:
     CONFIG = "ding.cfg"
 
-  cfg = configparser.SafeConfigParser()
+  cfg = configparser.ConfigParser()
   try:
     cfg.read(CONFIG)
 
diff --git a/dingd b/dingd
index 695c2f3..d713e7d 100755
--- a/dingd
+++ b/dingd
@@ -3,7 +3,7 @@
 # Author: Bandie Canis
 # License: 2-Clause BSD license
 
-import ssl, socket, subprocess, time, os, sys
+import ssl, socket, subprocess, time, os, sys, getopt
 import configparser
 
 CONFIG = None
@@ -26,7 +26,7 @@ def getTimestamp():
   return t
 
 def execFromConfig(option, pw=False):
-  cfg = configparser.SafeConfigParser()
+  cfg = configparser.ConfigParser()
   cfg.read(CONFIG)
 
   if(pw):
@@ -107,16 +107,19 @@ def main():
     except EOFError:
       print(getTimestamp(), "EOF")
 
-def init():
+def init(cfg=None):
 
   global CONFIG, host, port, cafile, certfile, keyfile, pw_on, password, pwtimeout, tmppw_on, context, bindsocket
 
-  if(os.name == 'nt'):
-    CONFIG = "dingd.win.cfg"
+  if(cfg==None):
+    if(os.name == 'nt'):
+      CONFIG = "dingd.win.cfg"
+    else:
+      CONFIG = "dingd.cfg"
   else:
-    CONFIG = "dingd.cfg"
+    CONFIG = cfg
 
-  cfg = configparser.SafeConfigParser()
+  cfg = configparser.ConfigParser()
   cfg.read(CONFIG)
 
   try:
@@ -176,10 +179,17 @@ def init():
 
 
 if(__name__ == "__main__"):
-
   try:
-    init()
+    conf = None
+    opts, args = getopt.getopt(sys.argv[1:], "c:")
+    for o, a in opts:
+      if o == "-c":
+        conf = a
+    init(conf)
     main()
+  except getopt.GetoptError as e:
+    print("Error using options. Allowed options:\n-c [FILE] - Config file\n")
+    quit(2)
   except KeyboardInterrupt:
     print("\r\rServer stopped.")