luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PhotoRec: code cleanup for .dxf recovery

Browse source
This commit is contained in:
Christophe Grenier 2014-07-26 15:50:07 +02:00
parent 03ac352e4f
commit a67f0c1ced
1 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/file_dxf.c
View file

@ -32,7 +32,6 @@
#include "filegen.h"
static void register_header_check_dxf(file_stat_t *file_stat);
static int header_check_dxf(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);
static data_check_t data_check_dxf(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery);
static void file_check_dxf(file_recovery_t *file_recovery);
@ -46,43 +45,22 @@ const file_hint_t file_hint_dxf= {
.register_header_check=&register_header_check_dxf
};
static const unsigned char header_dxflib[10]= {'9', '9', '9', '\n',
'd', 'x', 'f', 'l', 'i', 'b'};
static const unsigned char header_dxflib_dos[11]= {'9', '9', '9', '\r', '\n',
'd', 'x', 'f', 'l', 'i', 'b'};
static const unsigned char header_dxf[11]= {' ', ' ', '0', '\n',
'S', 'E', 'C', 'T', 'I', 'O', 'N'};
static const unsigned char header_dxf_dos[12]= {' ', ' ', '0', '\r', '\n',
'S', 'E', 'C', 'T', 'I', 'O', 'N'};
static void register_header_check_dxf(file_stat_t *file_stat)
{
register_header_check(0, header_dxf, sizeof(header_dxf), &header_check_dxf, file_stat);
register_header_check(0, header_dxf_dos, sizeof(header_dxf_dos), &header_check_dxf, file_stat);
register_header_check(0, header_dxflib, sizeof(header_dxflib), &header_check_dxf, file_stat);
register_header_check(0, header_dxflib_dos, sizeof(header_dxflib_dos), &header_check_dxf, file_stat);
}
static int header_check_dxf(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)
{
if(memcmp(buffer, header_dxf, sizeof(header_dxf))==0 ||
memcmp(buffer, header_dxf_dos, sizeof(header_dxf_dos))==0 ||
memcmp(buffer, header_dxflib, sizeof(header_dxflib))==0 ||
memcmp(buffer, header_dxflib_dos, sizeof(header_dxflib_dos))==0)
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_dxf.extension;
file_recovery_new->file_check=&file_check_dxf;
if(file_recovery_new->blocksize >= 3)
{
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_dxf.extension;
file_recovery_new->data_check=&data_check_dxf;
file_recovery_new->file_check=&file_check_dxf;
return 1;
}
return 0;
return 1;
}
static data_check_t data_check_dxf(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery)
{
unsigned int i;
for(i=(buffer_size/2)-3;i+3<buffer_size;i++)
for(i=(buffer_size/2)-3;i+4<buffer_size;i++)
{
if(buffer[i]=='\n' && buffer[i+1]=='E' && buffer[i+2]=='O' && buffer[i+3]=='F')
{
@ -100,3 +78,20 @@ static void file_check_dxf(file_recovery_t *file_recovery)
file_search_footer(file_recovery, dxf_footer, sizeof(dxf_footer), 0);
file_allow_nl(file_recovery, NL_BARENL|NL_CRLF);
}
static void register_header_check_dxf(file_stat_t *file_stat)
{
static const unsigned char header_dxflib[10]= {'9', '9', '9', '\n',
'd', 'x', 'f', 'l', 'i', 'b'};
static const unsigned char header_dxflib_dos[11]= {'9', '9', '9', '\r', '\n',
'd', 'x', 'f', 'l', 'i', 'b'};
static const unsigned char header_dxf[11]= {' ', ' ', '0', '\n',
'S', 'E', 'C', 'T', 'I', 'O', 'N'};
static const unsigned char header_dxf_dos[12]= {' ', ' ', '0', '\r', '\n',
'S', 'E', 'C', 'T', 'I', 'O', 'N'};
register_header_check(0, header_dxf, sizeof(header_dxf), &header_check_dxf, file_stat);
register_header_check(0, header_dxf_dos, sizeof(header_dxf_dos), &header_check_dxf, file_stat);
register_header_check(0, header_dxflib, sizeof(header_dxflib), &header_check_dxf, file_stat);
register_header_check(0, header_dxflib_dos, sizeof(header_dxflib_dos), &header_check_dxf, file_stat);
}