diff --git a/src/Makefile.am b/src/Makefile.am index aee0550c..04a960ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -309,6 +309,7 @@ file_C = filegen.c \ file_wtv.c \ file_wv.c \ file_x3f.c \ + file_xar.c \ file_xcf.c \ file_xfi.c \ file_xfs.c \ diff --git a/src/file_list.c b/src/file_list.c index 50cb3a8d..c507119f 100644 --- a/src/file_list.c +++ b/src/file_list.c @@ -313,6 +313,7 @@ extern const file_hint_t file_hint_wpd; extern const file_hint_t file_hint_wtv; extern const file_hint_t file_hint_wv; extern const file_hint_t file_hint_x3f; +extern const file_hint_t file_hint_xar; extern const file_hint_t file_hint_xcf; extern const file_hint_t file_hint_xfi; extern const file_hint_t file_hint_xfs; @@ -612,6 +613,7 @@ file_enable_t list_file_enable[]= { .enable=0, .file_hint=&file_hint_wtv }, { .enable=0, .file_hint=&file_hint_wv }, { .enable=0, .file_hint=&file_hint_x3f }, + { .enable=0, .file_hint=&file_hint_xar }, { .enable=0, .file_hint=&file_hint_xcf }, { .enable=0, .file_hint=&file_hint_xfi }, { .enable=0, .file_hint=&file_hint_xfs }, diff --git a/src/file_xar.c b/src/file_xar.c new file mode 100644 index 00000000..54ed6754 --- /dev/null +++ b/src/file_xar.c @@ -0,0 +1,78 @@ +/* + + File: file_xar.c + + Copyright (C) 2015 Christophe GRENIER + + 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 +#endif +#ifdef HAVE_STRING_H +#include +#endif +#include +#include "types.h" +#include "filegen.h" +#include "common.h" + +static void register_header_check_xar(file_stat_t *file_stat); + +const file_hint_t file_hint_xar= { + .extension="xar", + .description="xar archive", + .max_filesize=PHOTOREC_MAX_FILE_SIZE, + .recover=1, + .enable_by_default=1, + .register_header_check=®ister_header_check_xar +}; + +struct xar_header +{ + uint32_t magic; + uint16_t size; + uint16_t version; + uint64_t toc_length_compressed; + uint64_t toc_length_uncompressed; + uint32_t cksum_alg; + /* A nul-terminated, zero-padded to multiple of 4, message digest name + * appears here if cksum_alg is 3 which must not be empty ("") or "none". + */ +}; + +static int header_check_xar(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 xar_header *hdr=(const struct xar_header *)buffer; + if(be16(hdr->version) > 1) + return 0; + if(be16(hdr->size) < 28) + return 0; + if(be16(hdr->cksum_alg)==3 && (be16(hdr->size) <32 ||be16(hdr->size)%4!=0)) + return 0; + if(be16(hdr->cksum_alg)>3) + return 0; + reset_file_recovery(file_recovery_new); + file_recovery_new->extension=file_hint_xar.extension; + file_recovery_new->min_filesize=be16(hdr->size) + be64(hdr->toc_length_compressed); + return 1; +} + +static void register_header_check_xar(file_stat_t *file_stat) +{ + register_header_check(0, "xar!", 4, &header_check_xar, file_stat); +}