From dd9ecaa155aecba373fd4ab0280def08fb5e8e1b Mon Sep 17 00:00:00 2001
From: BrentHoltsclaw <brent.holtsclaw@intel.com>
Date: Tue, 6 Nov 2018 13:30:53 -0800
Subject: [PATCH] change to allow clonefile naming

---
 chipsec/chipset.py            | 2 +-
 chipsec/helper/file/helper.py | 7 +++++--
 chipsec/helper/oshelper.py    | 6 +++---
 chipsec_main.py               | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/chipsec/chipset.py b/chipsec/chipset.py
index 63dfa783..70a44e49 100644
--- a/chipsec/chipset.py
+++ b/chipsec/chipset.py
@@ -419,7 +419,7 @@ class Chipset:
             if logger().DEBUG: logger().error("pci.read_dword couldn't read PCH VID/DID")
         return (vid, did, pch_vid, pch_did)
 
-    def init( self, platform_code, req_pch_code, start_driver, driver_exists=False, to_file=False ):
+    def init( self, platform_code, req_pch_code, start_driver, driver_exists=False, to_file=None ):
 
         _unknown_platform = False
         self.helper.start(start_driver, driver_exists, to_file)
diff --git a/chipsec/helper/file/helper.py b/chipsec/helper/file/helper.py
index 3f12e0cb..e622103a 100644
--- a/chipsec/helper/file/helper.py
+++ b/chipsec/helper/file/helper.py
@@ -29,9 +29,12 @@ from chipsec.helper.oshelper import Helper
 import json
 
 class FileCmds:
-    def __init__(self):
+    def __init__(self, filename):
         self.data = {}
-        self.filename = "clone.json"
+        if filename == "":
+            self.filename = "clone.json"
+        else:
+            self.filename = filename
 
     def AddElement(self,cmd,args,ret):
         if self.data.has_key(cmd):
diff --git a/chipsec/helper/oshelper.py b/chipsec/helper/oshelper.py
index 73f84fcd..6909ad83 100644
--- a/chipsec/helper/oshelper.py
+++ b/chipsec/helper/oshelper.py
@@ -124,10 +124,10 @@ class OsHelper:
             except:
                 pass
 
-    def start(self, start_driver, driver_exists=False, to_file=False):
-        if to_file:
+    def start(self, start_driver, driver_exists=False, to_file=None):
+        if not to_file is None:
             from chipsec.helper.file.helper import FileCmds
-            self.filehelper = FileCmds()
+            self.filehelper = FileCmds(to_file)
         try:
             if not self.helper.create( start_driver ):
                 raise OsHelperError("failed to create OS helper")
diff --git a/chipsec_main.py b/chipsec_main.py
index 059388a7..283587ae 100644
--- a/chipsec_main.py
+++ b/chipsec_main.py
@@ -386,7 +386,7 @@ class ChipsecMain:
         adv_options.add_argument('--failfast', help="fail on any exception and exit (don't mask exceptions)",action='store_true')
         adv_options.add_argument('--no_time', help="don't log timestamps",action='store_true')
         adv_options.add_argument('--deltas',dest='_deltas_file', help='specifies a JSON log file to compute result deltas from')
-        adv_options.add_argument('--clone',dest='_to_file',help='run chipsec and clone helper results into clone.json')
+        adv_options.add_argument('--clone',dest='_to_file',help='run chipsec and clone helper results into JSON file')
 
         parser.parse_args(self.argv,namespace=ChipsecMain)