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

pdiskseln.c,phrecn.c,ppartseln.c: disable some code for Frama-C

Browse source
This commit is contained in:
Christophe Grenier 2022-04-07 20:25:04 +02:00
parent 3dee436027
commit 37286661af
3 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/pdiskseln.c
View file

@ -314,7 +314,7 @@ int do_curses_photorec(struct ph_param *params, struct ph_options *options, cons
{
/*@ assert valid_read_string(params->cmd_run); */
params->disk=photorec_disk_selection_cli(params->cmd_device, list_disk, &list_search_space);
/*@ assert valid_disk(params->disk); */
/*@ assert params->disk == \null || valid_disk(params->disk); */
#if defined(HAVE_NCURSES)
if(params->disk==NULL)
{
@ -336,6 +336,7 @@ int do_curses_photorec(struct ph_param *params, struct ph_options *options, cons
/*@ assert params->cmd_run == \null || valid_read_string(params->cmd_run); */
return 0;
}
/*@ assert valid_disk(params->disk); */
change_arch_type_cli(params->disk, options->verbose, &params->cmd_run);
autoset_unit(params->disk);
menu_photorec(params, options, &list_search_space);

30
src/phrecn.c
View file

@ -88,7 +88,6 @@
/* #define DEBUG_BF */
#define DEFAULT_IMAGE_NAME "image_remaining.dd"
extern file_check_list_t file_check_list;
extern int need_to_stop;
static int interface_cannot_create_file(void);
@ -194,12 +193,18 @@ static int interface_cannot_create_file(void)
return 1;
}
#else
/*@ assigns \nothing; */
static int interface_cannot_create_file(void)
{
return 1;
}
#endif
#ifdef HAVE_NCURSES
/*@
@ requires valid_read_string(filename);
@ requires \valid_read(list_search_space);
@*/
static void gen_image(const char *filename, disk_t *disk, const alloc_data_t *list_search_space)
{
struct td_list_head *search_walker = NULL;
@ -233,15 +238,20 @@ static void gen_image(const char *filename, disk_t *disk, const alloc_data_t *li
free(buffer);
fclose(out);
}
#endif
int photorec(struct ph_param *params, const struct ph_options *options, alloc_data_t *list_search_space)
{
pstatus_t ind_stop=PSTATUS_OK;
const unsigned int blocksize_is_known=params->blocksize;
/*@ assert valid_read_string(params->recup_dir); */
params_reset(params, options);
/*@ assert valid_read_string(params->recup_dir); */
if(params->cmd_run!=NULL && params->cmd_run[0]!='\0')
{
skip_comma_in_command(&params->cmd_run);
/*@ assert valid_read_string(params->recup_dir); */
#ifndef __FRAMAC__
if(check_command(&params->cmd_run,"status=unformat",15)==0)
{
params->status=STATUS_UNFORMAT;
@ -274,6 +284,7 @@ int photorec(struct ph_param *params, const struct ph_options *options, alloc_da
{
params->status=STATUS_EXT2_OFF;
}
#endif
}
else
{
@ -283,11 +294,13 @@ int photorec(struct ph_param *params, const struct ph_options *options, alloc_da
params->status=STATUS_UNFORMAT;
#endif
}
/*@ assert valid_read_string(params->recup_dir); */
screen_buffer_reset();
#ifndef __FRAMAC__
log_info("\nAnalyse\n");
log_partition(params->disk, params->partition);
#endif
/*@ assert valid_read_string(params->recup_dir); */
/* make the first recup_dir */
params->dir_num=photorec_mkdir(params->recup_dir, params->dir_num);
@ -297,11 +310,16 @@ int photorec(struct ph_param *params, const struct ph_options *options, alloc_da
xml_setup(params->disk, params->partition);
#endif
/*@
@ loop invariant valid_ph_param(params);
@*/
for(params->pass=0; params->status!=STATUS_QUIT; params->pass++)
{
const unsigned int old_file_nbr=params->file_nbr;
#ifndef __FRAMAC__
log_info("Pass %u (blocksize=%u) ", params->pass, params->blocksize);
log_info("%s\n", status_to_name(params->status));
#endif
#ifdef HAVE_NCURSES
aff_copy(stdscr);
@ -325,6 +343,7 @@ int photorec(struct ph_param *params, const struct ph_options *options, alloc_da
params->blocksize=blocksize_is_known;
break;
case STATUS_FIND_OFFSET:
#ifndef __FRAMAC__
{
uint64_t start_offset=0;
if(blocksize_is_known>0)
@ -344,6 +363,9 @@ int photorec(struct ph_param *params, const struct ph_options *options, alloc_da
#endif
update_blocksize(params->blocksize, list_search_space, start_offset);
}
#else
params->blocksize=512;
#endif
break;
case STATUS_EXT2_ON_BF:
case STATUS_EXT2_OFF_BF:
@ -417,6 +439,7 @@ int photorec(struct ph_param *params, const struct ph_options *options, alloc_da
unlink("photorec.ses");
break;
}
#ifndef __FRAMAC__
{
const time_t current_time=time(NULL);
log_info("Elapsed time %uh%02um%02us\n",
@ -431,6 +454,7 @@ int photorec(struct ph_param *params, const struct ph_options *options, alloc_da
write_stats_log(params->file_stats);
}
log_flush();
#endif
}
#ifdef HAVE_NCURSES
if(options->expert>0 && !td_list_empty(&list_search_space->list))

6
src/ppartseln.c
View file

@ -92,6 +92,7 @@ void menu_photorec(struct ph_param *params, struct ph_options *options, alloc_da
list_part=init_list_part(params->disk, options);
if(list_part==NULL)
return;
/*@ assert valid_list_part(list_part); */
log_all_partitions(params->disk, list_part);
if(params->cmd_run!=NULL)
{
@ -117,7 +118,10 @@ void menu_photorec(struct ph_param *params, struct ph_options *options, alloc_da
}
}
if(params->recup_dir!=NULL)
{
/*@ assert valid_read_string(params->recup_dir); */
photorec(params, options, list_search_space);
}
}
}
if(params->cmd_run!=NULL)
@ -262,10 +266,12 @@ void menu_photorec(struct ph_param *params, struct ph_options *options, alloc_da
if(strcmp(params->recup_dir,"/")!=0)
strcat(params->recup_dir,"/");
strcat(params->recup_dir,DEFAULT_RECUP_DIR);
/*@ assert valid_read_string(params->recup_dir); */
}
}
if(params->recup_dir!=NULL)
{
/*@ assert valid_read_string(params->recup_dir); */
if(td_list_empty(&list_search_space->list))
{
init_search_space(list_search_space, params->disk, params->partition);