Fix to allow loading signatures from a different location

horsicq · Oct 11, 2018 · 721da55 · 721da55
1 parent ec129c8
commit 721da55
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/die_source/console/mainc.cpp b/die_source/console/mainc.cpp
@@ -510,7 +510,14 @@ int main(int argc, char *argv[])
 
         SingleFileScan sfs;
 
-        //        sfs.setOptions(&options);
+        sfs.setDataBase(SingleFileScan::options.sDataBasePath);
+
+        bInvalidBase=(SingleFileScan::options.listBinaryScripts.count()==0)
+                      &&(SingleFileScan::options.listELFScripts.count()==0)
+                      &&(SingleFileScan::options.listMACHScripts.count()==0)
+                      &&(SingleFileScan::options.listMSDOSScripts.count()==0)
+                      &&(SingleFileScan::options.listPEScripts.count()==0)
+                      &&(SingleFileScan::options.listTextScripts.count()==0);
 
         for(int i=0; i<listFiles.count(); i++)
         {

diff --git a/die_source/singlefilescan.cpp b/die_source/singlefilescan.cpp
@@ -126,20 +126,12 @@ void SingleFileScan::setDataBase(QString sDataBase)
         sDataBase=__DefaultDataBasePath;
     }
 
-    if(options.sDataBasePath!=sDataBase)
-    {
-        options.sDataBasePath=sDataBase;
-        Scan::die_loadScripts(&options);
+    options.sDataBasePath=sDataBase;
+    Scan::die_loadScripts(&options);
 #ifdef QT_DEBUG
-        qDebug("New database: %s",sDataBase.toLatin1().data());
+    qDebug("New database: %s",sDataBase.toLatin1().data());
 #endif
-    }
-    else
-    {
-#ifdef QT_DEBUG
-        qDebug("old database: %s",options.sDataBasePath.toLatin1().data());
-#endif
-    }
+
 }
 
 __DIE_OPTIONS SingleFileScan::options={};