Merge https://github.com/farvardin/testdisk into farvardin

src/Makefile.am

@@ -127,6 +127,7 @@ file_C			= filegen.c \
 			  file_doc.c \
 			  file_dpx.c \
 			  file_drw.c \
+			  file_drw2.c \
 			  file_ds2.c \
 			  file_ds_store.c \
 			  file_dsc.c \

src/file_drw2.c

@@ -0,0 +1,72 @@
+/*
+
+    File: file_drw2.c
+
+    Copyright (C) YEAR Christophe GRENIER <grenier@cgsecurity.org>
+
+    This software is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write the Free Software Foundation, Inc., 51
+    Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ */
+
+#if !defined(SINGLE_FORMAT) || defined(SINGLE_FORMAT_drw2)
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#include <stdio.h>
+#include "types.h"
+#include "filegen.h"
+
+/*@ requires \valid(file_stat); */
+static void register_header_check_drw2(file_stat_t *file_stat);
+
+const file_hint_t file_hint_drw2= {
+  .extension="drw",
+  .description="Designer DRW file",
+  .max_filesize=PHOTOREC_MAX_FILE_SIZE,
+  .recover=1,
+  .enable_by_default=1,
+  .register_header_check=&register_header_check_drw2
+};
+
+/*
+static void file_check_drw2(file_recovery_t *file_recovery)
+{
+  const unsigned char drw2_footer[FOOTER_SIZE]= {
+    FOOTER_MAGIC
+  };
+  file_search_footer(file_recovery, drw2_footer, sizeof(drw2_footer), FOOTER_EXTRA);
+}
+*/
+
+static int header_check_drw2(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new)
+{
+  reset_file_recovery(file_recovery_new);
+  file_recovery_new->extension=file_hint_drw2.extension;
+  //file_recovery_new->file_check=&file_check_drw2;
+  return 1;
+}
+
+static void register_header_check_drw2(file_stat_t *file_stat)
+{
+  static const unsigned char drw2_header[10]=  {
+     0x01, 0xff, 0x02, 0x04, 0x03, 0x02, 0x00, 0x02, 0x02, 0x02 
+   // 0x01, 0xff, 0x02, 0x04, 0x03, 0x02, 0x00, 0x02, 0x02, 0x02, 0x21, 0x05, 0x00, 0x04
+  };
+  register_header_check(0, drw2_header, sizeof(drw2_header), &header_check_drw2, file_stat);
+}
+#endif

src/file_list.c

@@ -105,6 +105,7 @@ extern const file_hint_t file_hint_dmp;
 extern const file_hint_t file_hint_doc;
 extern const file_hint_t file_hint_dpx;
 extern const file_hint_t file_hint_drw;
+extern const file_hint_t file_hint_drw2;
 extern const file_hint_t file_hint_ds2;
 extern const file_hint_t file_hint_ds_store;
 extern const file_hint_t file_hint_dsc;
@@ -599,6 +600,9 @@ file_enable_t array_file_enable[]=
 #if !defined(SINGLE_FORMAT) || defined(SINGLE_FORMAT_drw)
   { .enable=0, .file_hint=&file_hint_drw  },
 #endif
+#if !defined(SINGLE_FORMAT) || defined(SINGLE_FORMAT_drw2)
+  { .enable=0, .file_hint=&file_hint_drw2  },
+#endif
 #if !defined(SINGLE_FORMAT) || defined(SINGLE_FORMAT_doc)
   { .enable=0, .file_hint=&file_hint_doc  },
 #endif