add /sigfile parameter

Author: piotrkochan

src/file_sig.c

@@ -149,6 +149,17 @@ static signature_t signatures={
   .list = TD_LIST_HEAD_INIT(signatures.list)
 };
 
+static char *custom_sig_file = NULL;
+
+void set_custom_signature_file(const char *path)
+{
+  if(custom_sig_file != NULL)
+  {
+    free(custom_sig_file);
+  }
+  custom_sig_file = (path != NULL) ? strdup(path) : NULL;
+}
+
 /*@
   @ assigns \nothing;
   @*/
@@ -261,6 +272,20 @@ static int header_check_sig(const unsigned char *buffer, const unsigned int buff
 
 static FILE *open_signature_file(void)
 {
+  if(custom_sig_file != NULL)
+  {
+    FILE *handle = fopen(custom_sig_file, "rb");
+    if(handle != NULL)
+    {
+#ifndef DISABLED_FOR_FRAMAC
+      log_info("Open signature file %s\n", custom_sig_file);
+#endif
+      return handle;
+    }
+#ifndef DISABLED_FOR_FRAMAC
+    log_error("Failed to open signature file %s\n", custom_sig_file);
+#endif
+  }
 #if defined(__CYGWIN__) || defined(__MINGW32__)
   {
     char *path;

src/filegen.h

@@ -476,6 +476,8 @@ time_t get_time_from_YYYYMMDD_HHMMSS(const char *date_asc);
   @*/
 void get_prev_location_smart(const alloc_data_t *list_search_space, alloc_data_t **current_search_space, uint64_t *offset, const uint64_t prev_location);
 
+void set_custom_signature_file(const char *path);
+
 #ifdef __cplusplus
 } /* closing brace for extern "C" */
 #endif

src/phmain.c

@@ -123,11 +123,12 @@ static void sighup_hdlr(int sig)
 
 static void display_help(void)
 {
-  printf("\nUsage: photorec [/log] [/debug] [/d recup_dir] [file.dd|file.e01|device]\n"\
+  printf("\nUsage: photorec [/log] [/debug] [/d recup_dir] [/sigfile photorec.sig] [file.dd|file.e01|device]\n"\
       "       photorec /version\n" \
       "\n" \
       "/log          : create a photorec.log file\n" \
       "/debug        : add debug information\n" \
+      "/sigfile path : specify custom path to signature file\n" \
       "\n" \
       "PhotoRec searches for various file formats (JPEG, Office...). It stores files\n" \
       "in the recup_dir directory.\n");
@@ -277,6 +278,11 @@ int main( int argc, char **argv )
       }
       i++;
     }
+    else if(i+1<argc && ((strcmp(argv[i],"/sigfile")==0)||(strcmp(argv[i],"-sigfile")==0)))
+    {
+      set_custom_signature_file(argv[i+1]);
+      i++;
+    }
     else if((strcmp(argv[i],"/all")==0) || (strcmp(argv[i],"-all")==0))
       testdisk_mode|=TESTDISK_O_ALL;
     else if((strcmp(argv[i],"/direct")==0) || (strcmp(argv[i],"-direct")==0))