Pass cmdline instead of parts of it to run_security_analyser

Author: NathanJPhillips

driver/analyser.py

@@ -43,23 +43,18 @@ def get_symex_pathname():
     return os.path.abspath(os.path.join(_tools_binary_dir, "symex"))
 
 
-def run_security_analyser(
-        config_json_file,
-        verbosity,
-        results_dir,
-        use_goto_binary
-):
+def run_security_analyser(config_json_file, cmdline):
     prof = {}
     prof_start_time = time.time()
 
-    if not os.path.exists(results_dir):
-        os.makedirs(results_dir)
+    if not os.path.exists(cmdline.results_dir):
+        os.makedirs(cmdline.results_dir)
 
     old_cwd = os.getcwd()
-    os.chdir(results_dir)
+    os.chdir(cmdline.results_dir)
 
-    if use_goto_binary:
-        program_json_file = os.path.abspath(os.path.join(results_dir, "program.json"))
+    if cmdline.use_goto_binary:
+        program_json_file = os.path.abspath(os.path.join(cmdline.results_dir, "program.json"))
         with open(program_json_file, "r") as ifile:
             program_info = json.load(ifile)
         assert "gbf" in program_info
@@ -72,8 +67,8 @@ def run_security_analyser(
             prof["calling_security_analyser_for_goto_program_generation"] = {}
             prof_calling_security_analyser_start_time = time.time()
             print("Invoking 'security-analyser' to translate Java to GOTO program.")
-            if verbosity >= 9:
-                print("CWD: " + results_dir)
+            if cmdline.verbosity >= 9:
+                print("CWD: " + cmdline.results_dir)
                 print("CMD: " + command)
             os.system(command)
             prof["calling_security_analyser_for_goto_program_generation"]["duration"] = time.time() - prof_calling_security_analyser_start_time
@@ -85,8 +80,8 @@ def run_security_analyser(
     prof["calling_security_analyser"] = {}
     prof_calling_security_analyser_start_time = time.time()
     print("Invoking 'security-analyser' ...")
-    if verbosity >= 9:
-        print("CWD: " + results_dir)
+    if cmdline.verbosity >= 9:
+        print("CWD: " + cmdline.results_dir)
         print("CMD: " + command)
     os.system(command)
     prof["calling_security_analyser"]["duration"] = time.time() - prof_calling_security_analyser_start_time

driver/run.py

@@ -271,10 +271,7 @@ def run_scan(cmdline):
 
     prof["summary_computation"] = analyser.run_security_analyser(
         os.path.abspath(os.path.join(cmdline.results_dir, "config.json")),
-        cmdline.verbosity,
-        cmdline.results_dir,
-        cmdline.use_goto_binary
-        )
+        cmdline)
 
     instrumented_programs_json_path = \
         os.path.join(cmdline.results_dir, "program_slicing", "instrumented_goto_programs.json")