summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2012-09-16 18:26:31 +0200
committerChristophe Grenier <grenier@cgsecurity.org>2012-09-16 18:26:31 +0200
commit35c8008dc0bd9f0239940bdb03d0de075eeca118 (patch)
treef84f752dfe0a466b03a26bf3d07044bd90adf9a2 /src
parent465a0bf1bdc4a84d170d9e707d36a9dade377577 (diff)
PhotoRec: detect HFSP/HFSX superblock
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am1
-rw-r--r--src/file_hfsp.c62
-rw-r--r--src/file_list.c2
3 files changed, 65 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 3228853..47ae2af 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -130,6 +130,7 @@ file_C = filegen.c \
file_gz.c \
file_hdf.c \
file_hds.c \
+ file_hfsp.c \
file_hr9.c \
file_http.c \
file_icc.c \
diff --git a/src/file_hfsp.c b/src/file_hfsp.c
new file mode 100644
index 0000000..5d6fdd4
--- /dev/null
+++ b/src/file_hfsp.c
@@ -0,0 +1,62 @@
+/*
+
+ File: file_hfs.c
+
+ Copyright (C) 2012 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.
+
+ */
+
+#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"
+#include "common.h"
+#include "hfsp.h"
+
+static void register_header_check_hfsp(file_stat_t *file_stat);
+
+const file_hint_t file_hint_hfsp= {
+ .extension="hfsp",
+ .description="HFS+/HFSX",
+ .min_header_distance=0,
+ .max_filesize=2048,
+ .recover=0,
+ .enable_by_default=1,
+ .register_header_check=&register_header_check_hfsp
+};
+
+static int header_check_hfsp(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)
+{
+ const struct hfsp_vh *vh=(const struct hfsp_vh *)buffer;
+ if (!(be32(vh->blocksize)%512==0 && be32(vh->blocksize)!=0 && be32(vh->free_blocks)<=be32(vh->total_blocks)))
+ return 0;
+reset_file_recovery(file_recovery_new);
+ file_recovery_new->extension=file_hint_hfsp.extension;
+ return 1;
+}
+
+static void register_header_check_hfsp(file_stat_t *file_stat)
+{
+ register_header_check(0, "H+\0\4", 4, &header_check_hfsp, file_stat);
+ register_header_check(0, "HX\0\5", 4, &header_check_hfsp, file_stat);
+}
+
diff --git a/src/file_list.c b/src/file_list.c
index 2f670f4..b0da19d 100644
--- a/src/file_list.c
+++ b/src/file_list.c
@@ -133,6 +133,7 @@ extern const file_hint_t file_hint_gpg;
extern const file_hint_t file_hint_gz;
extern const file_hint_t file_hint_hdf;
extern const file_hint_t file_hint_hds;
+extern const file_hint_t file_hint_hfsp;
extern const file_hint_t file_hint_hr9;
extern const file_hint_t file_hint_icc;
extern const file_hint_t file_hint_ico;
@@ -387,6 +388,7 @@ file_enable_t list_file_enable[]=
{ .enable=0, .file_hint=&file_hint_gz },
{ .enable=0, .file_hint=&file_hint_hdf },
{ .enable=0, .file_hint=&file_hint_hds },
+ { .enable=0, .file_hint=&file_hint_hfsp },
{ .enable=0, .file_hint=&file_hint_hr9 },
{ .enable=0, .file_hint=&file_hint_icc },
{ .enable=0, .file_hint=&file_hint_ico },