summaryrefslogtreecommitdiffstats
path: root/src/psearchn.c
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2018-03-17 10:25:05 +0100
committerChristophe Grenier <grenier@cgsecurity.org>2018-03-17 10:25:05 +0100
commit37b48a9fd645d38ab50bb33066acdaf868529d95 (patch)
tree11b4a3d71b7a3265978ba24e0127af7a062fc765 /src/psearchn.c
parentc0e81e1f92005718ad3a8c21bd7d3d8d74b075bb (diff)
QPhotoRec: update the algo to match the one from PhotoRec
Diffstat (limited to 'src/psearchn.c')
-rw-r--r--src/psearchn.c152
1 files changed, 3 insertions, 149 deletions
diff --git a/src/psearchn.c b/src/psearchn.c
index 52805bb..562a707 100644
--- a/src/psearchn.c
+++ b/src/psearchn.c
@@ -68,147 +68,8 @@
#include "phnc.h"
#endif
#include "psearchn.h"
-
+#include "photorec_check_header.h"
#define READ_SIZE 1024*512
-extern const file_hint_t file_hint_tar;
-extern const file_hint_t file_hint_dir;
-extern file_check_list_t file_check_list;
-
-#if defined(__CYGWIN__) || defined(__MINGW32__)
-/* Live antivirus protection may open file as soon as they are created by *
- * PhotoRec. PhotoRec will not be able to overwrite a file as long as the *
- * antivirus is scanning it, so let's wait a little bit if the creation *
- * failed. */
-
-#ifndef HAVE_SLEEP
-#define sleep(x) Sleep((x)*1000)
-#endif
-
-static FILE *fopen_with_retry(const char *path, const char *mode)
-{
- FILE *handle;
- if((handle=fopen(path, mode))!=NULL)
- return handle;
-#ifdef __MINGW32__
- Sleep(1000);
-#else
- sleep(1);
-#endif
- if((handle=fopen(path, mode))!=NULL)
- return handle;
-#ifdef __MINGW32__
- Sleep(2000);
-#else
- sleep(2);
-#endif
- if((handle=fopen(path, mode))!=NULL)
- return handle;
- return NULL;
-}
-#endif
-
-static void photorec_dir_fat(const unsigned char *buffer, const unsigned int read_size, const unsigned long long sector)
-{
- file_info_t dir_list;
- TD_INIT_LIST_HEAD(&dir_list.list);
- dir_fat_aux(buffer, read_size, 0, &dir_list);
- if(!td_list_empty(&dir_list.list))
- {
- log_info("Sector %llu\n", sector);
- dir_aff_log(NULL, &dir_list);
- delete_list_file(&dir_list);
- }
-}
-
-static pstatus_t photorec_new_file(file_recovery_t *file_recovery, struct ph_param *params, const uint64_t offset)
-{
- set_filename(file_recovery, params);
- if(file_recovery->file_stat->file_hint->recover==1)
- {
-#if defined(__CYGWIN__) || defined(__MINGW32__)
- file_recovery->handle=fopen_with_retry(file_recovery->filename,"w+b");
-#else
- file_recovery->handle=fopen(file_recovery->filename,"w+b");
-#endif
- if(!file_recovery->handle)
- {
- log_critical("Cannot create file %s: %s\n", file_recovery->filename, strerror(errno));
- params->offset=offset;
- return PSTATUS_EACCES;
- }
- }
- return PSTATUS_OK;
-}
-
-static pstatus_t photorec_header_found(file_recovery_t *file_recovery_new, file_recovery_t *file_recovery, struct ph_param *params, const struct ph_options *options, alloc_data_t *list_search_space, const unsigned char *buffer, pfstatus_t *file_recovered, const uint64_t offset)
-{
- *file_recovered=PFSTATUS_BAD;
- if(file_recovery_new->file_stat==NULL || file_recovery_new->file_stat->file_hint==NULL)
- return PSTATUS_OK;
- file_recovery_new->location.start=offset;
- if(file_recovery->file_stat!=NULL)
- {
- if(options->verbose > 1)
- log_trace("A known header has been found, recovery of the previous file is finished\n");
- *file_recovered=file_finish2(file_recovery, params, options->paranoid, list_search_space);
- if(*file_recovered==PFSTATUS_OK_TRUNCATED)
- return PSTATUS_OK;
- }
- file_recovery_cpy(file_recovery, file_recovery_new);
- if(options->verbose > 1)
- {
- log_info("%s header found at sector %lu\n",
- ((file_recovery->extension!=NULL && file_recovery->extension[0]!='\0')?
- file_recovery->extension:file_recovery->file_stat->file_hint->description),
- (unsigned long)((file_recovery->location.start-params->partition->part_offset)/params->disk->sector_size));
- log_info("file_recovery->location.start=%lu\n",
- (unsigned long)(file_recovery->location.start/params->disk->sector_size));
- }
- if(file_recovery->file_stat->file_hint==&file_hint_dir && options->verbose > 0)
- { /* FAT directory found, list the file */
- const unsigned int blocksize=params->blocksize;
- const unsigned int read_size=(blocksize>65536?blocksize:65536);
- photorec_dir_fat(buffer, read_size, file_recovery->location.start/params->disk->sector_size);
- }
- return photorec_new_file(file_recovery, params, offset);
-}
-
-inline static pstatus_t photorec_check_header(file_recovery_t *file_recovery, struct ph_param *params, const struct ph_options *options, alloc_data_t *list_search_space, const unsigned char *buffer, pfstatus_t *file_recovered, const uint64_t offset)
-{
- const struct td_list_head *tmpl;
- const unsigned int blocksize=params->blocksize;
- const unsigned int read_size=(blocksize>65536?blocksize:65536);
- file_recovery_t file_recovery_new;
- file_recovery_new.blocksize=blocksize;
- if(file_recovery->file_stat!=NULL && file_recovery->file_stat->file_hint==&file_hint_tar &&
- header_check_tar(buffer-0x200,0x200, 0, file_recovery, &file_recovery_new))
- { /* Currently saving a tar, do not check the data for know header */
- if(options->verbose > 1)
- {
- log_verbose("Currently saving a tar file, sector %lu.\n",
- (unsigned long)((offset-params->partition->part_offset)/params->disk->sector_size));
- }
- return PSTATUS_OK;
- }
- file_recovery_new.file_stat=NULL;
- file_recovery_new.location.start=offset;
- td_list_for_each(tmpl, &file_check_list.list)
- {
- const struct td_list_head *tmp;
- const file_check_list_t *pos=td_list_entry_const(tmpl, const file_check_list_t, list);
- td_list_for_each(tmp, &pos->file_checks[buffer[pos->offset]].list)
- {
- const file_check_t *file_check=td_list_entry_const(tmp, const file_check_t, list);
- if((file_check->length==0 || memcmp(buffer + file_check->offset, file_check->value, file_check->length)==0) &&
- file_check->header_check(buffer, read_size, 0, file_recovery, &file_recovery_new)!=0)
- {
- file_recovery_new.file_stat=file_check->file_stat;
- return photorec_header_found(&file_recovery_new, file_recovery, params, options, list_search_space, buffer, file_recovered, offset);
- }
- }
- }
- return PSTATUS_OK;
-}
pstatus_t photorec_aux(struct ph_param *params, const struct ph_options *options, alloc_data_t *list_search_space)
{
@@ -422,15 +283,6 @@ pstatus_t photorec_aux(struct ph_param *params, const struct ph_options *options
ind_stop=photorec_progressbar(stdscr, params->pass, params, offset, current_time);
#endif
params->offset=offset;
- if(current_time >= next_checkpoint)
- {
- time_t new_time;
- /* Save current progress */
- session_save(list_search_space, params, options);
- new_time=time(NULL);
- /* If it takes more then 30s to save the session, save every 15 minutes instead of every 5 minutes */
- next_checkpoint=new_time+(current_time+30<new_time?15:5)*60;
- }
if(ind_stop!=PSTATUS_OK)
{
log_info("PhotoRec has been stopped\n");
@@ -438,6 +290,8 @@ pstatus_t photorec_aux(struct ph_param *params, const struct ph_options *options
free(buffer_start);
return ind_stop;
}
+ if(current_time >= next_checkpoint)
+ next_checkpoint=regular_session_save(list_search_space, params, options, current_time);
}
}
}