diff options
113 files changed, 261 insertions, 121 deletions
diff --git a/src/file_7z.c b/src/file_7z.c index 0f077329..b5809252 100644 --- a/src/file_7z.c +++ b/src/file_7z.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_7z= { .min_header_distance=0, .max_filesize=1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_7z }; diff --git a/src/file_a.c b/src/file_a.c index 8d4777d0..2a6cf0d2 100644 --- a/src/file_a.c +++ b/src/file_a.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_a= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_a }; diff --git a/src/file_ab.c b/src/file_ab.c index dac5a4a4..489d1180 100644 --- a/src/file_ab.c +++ b/src/file_ab.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_addressbook= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_ab }; diff --git a/src/file_ace.c b/src/file_ace.c index 89f959f9..bb951f0a 100644 --- a/src/file_ace.c +++ b/src/file_ace.c @@ -44,6 +44,7 @@ const file_hint_t file_hint_ace= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_ace }; diff --git a/src/file_aif.c b/src/file_aif.c index 41bb93d3..ea4381ee 100644 --- a/src/file_aif.c +++ b/src/file_aif.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_aif= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_aif }; diff --git a/src/file_all.c b/src/file_all.c index 998e81d1..9ba9e883 100644 --- a/src/file_all.c +++ b/src/file_all.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_all= { .min_header_distance=0, .max_filesize=50*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_all }; diff --git a/src/file_asf.c b/src/file_asf.c index 247b86b8..6997d7ca 100644 --- a/src/file_asf.c +++ b/src/file_asf.c @@ -40,6 +40,8 @@ const file_hint_t file_hint_asf= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, + .enable_by_default=1, .register_header_check=®ister_header_check_asf }; diff --git a/src/file_au.c b/src/file_au.c index bdc75e3d..c8f1132e 100644 --- a/src/file_au.c +++ b/src/file_au.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_au= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_au }; diff --git a/src/file_bkf.c b/src/file_bkf.c index 0324c67e..4ddeac46 100644 --- a/src/file_bkf.c +++ b/src/file_bkf.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_bkf= { .min_header_distance=0, .max_filesize=-1, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_bkf }; diff --git a/src/file_bld.c b/src/file_bld.c index 0d249123..fdf42b83 100644 --- a/src/file_bld.c +++ b/src/file_bld.c @@ -44,6 +44,7 @@ const file_hint_t file_hint_blend= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_blend }; diff --git a/src/file_bmp.c b/src/file_bmp.c index c6d56764..29722988 100644 --- a/src/file_bmp.c +++ b/src/file_bmp.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_bmp= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_bmp }; diff --git a/src/file_bz2.c b/src/file_bz2.c index 19ef33fd..0e737437 100644 --- a/src/file_bz2.c +++ b/src/file_bz2.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_bz2= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_bz2 }; diff --git a/src/file_cab.c b/src/file_cab.c index 5b4d9d49..6283405e 100644 --- a/src/file_cab.c +++ b/src/file_cab.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_cab= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_cab }; diff --git a/src/file_cam.c b/src/file_cam.c index 617dc3d5..ff25a45e 100644 --- a/src/file_cam.c +++ b/src/file_cam.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_cam= { .min_header_distance=0, .max_filesize=10*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_cam }; diff --git a/src/file_cm.c b/src/file_cm.c index ee73fcd4..be8a21f8 100644 --- a/src/file_cm.c +++ b/src/file_cm.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_cm= { .min_header_distance=0x0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_cm }; diff --git a/src/file_crw.c b/src/file_crw.c index 25f0c747..a05875c7 100644 --- a/src/file_crw.c +++ b/src/file_crw.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_crw= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_crw }; diff --git a/src/file_ctg.c b/src/file_ctg.c index 3d1133a4..98c0af36 100644 --- a/src/file_ctg.c +++ b/src/file_ctg.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_ctg= { .min_header_distance=0, .max_filesize=4634, .recover=0, + .enable_by_default=1, .register_header_check=®ister_header_check_ctg }; diff --git a/src/file_cwk.c b/src/file_cwk.c index 99f1bfbc..4e3bc213 100644 --- a/src/file_cwk.c +++ b/src/file_cwk.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_cwk= { .min_header_distance=0, .max_filesize=200*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_cwk }; diff --git a/src/file_dat.c b/src/file_dat.c index 654ff207..f983db71 100644 --- a/src/file_dat.c +++ b/src/file_dat.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_dat= { .min_header_distance=0, .max_filesize=2*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_dat }; diff --git a/src/file_dbf.c b/src/file_dbf.c index ee6f0a6d..ce6362aa 100644 --- a/src/file_dbf.c +++ b/src/file_dbf.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_dbf= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=0, .register_header_check=®ister_header_check_dbf }; diff --git a/src/file_dim.c b/src/file_dim.c index 030d4357..02777d06 100644 --- a/src/file_dim.c +++ b/src/file_dim.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_dim= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_dim }; diff --git a/src/file_dir.c b/src/file_dir.c index e58fadaf..355a55e3 100644 --- a/src/file_dir.c +++ b/src/file_dir.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_dir= { .min_header_distance=0, .max_filesize=1, .recover=0, + .enable_by_default=1, .register_header_check=®ister_header_check_dir }; diff --git a/src/file_djv.c b/src/file_djv.c index 28cccff6..107f63c7 100644 --- a/src/file_djv.c +++ b/src/file_djv.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_djv= { .min_header_distance=0, .max_filesize=200*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_djv }; diff --git a/src/file_doc.c b/src/file_doc.c index c2ab0d39..8fba854f 100644 --- a/src/file_doc.c +++ b/src/file_doc.c @@ -48,6 +48,7 @@ const file_hint_t file_hint_doc= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_doc }; diff --git a/src/file_dpx.c b/src/file_dpx.c index 92ac6c53..0705b544 100644 --- a/src/file_dpx.c +++ b/src/file_dpx.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_dpx= { .min_header_distance=0, .max_filesize=10*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_dpx }; diff --git a/src/file_dsc.c b/src/file_dsc.c index 24a1e24a..2bfe1e59 100644 --- a/src/file_dsc.c +++ b/src/file_dsc.c @@ -38,6 +38,7 @@ const file_hint_t file_hint_dsc= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=0, + .enable_by_default=1, .register_header_check=®ister_header_check_dsc }; diff --git a/src/file_dss.c b/src/file_dss.c index 1ef61a0e..6bc5f4b4 100644 --- a/src/file_dss.c +++ b/src/file_dss.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_dss= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_dss }; diff --git a/src/file_dta.c b/src/file_dta.c index 4e8d77f4..3b611097 100644 --- a/src/file_dta.c +++ b/src/file_dta.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_dta= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=0, .register_header_check=®ister_header_check_dta }; diff --git a/src/file_dump.c b/src/file_dump.c index 248ef670..57307583 100644 --- a/src/file_dump.c +++ b/src/file_dump.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_dump= { .min_header_distance=0, .max_filesize=(((uint64_t)1<<33)-1), .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_dump }; diff --git a/src/file_dv.c b/src/file_dv.c index f8f9d539..d28aef76 100644 --- a/src/file_dv.c +++ b/src/file_dv.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_dv= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_dv }; static const unsigned char dv_header[3]= {0x1f, 0x07, 0x00}; diff --git a/src/file_dwg.c b/src/file_dwg.c index 7ba9629c..aad02b81 100644 --- a/src/file_dwg.c +++ b/src/file_dwg.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_dwg= { .min_header_distance=0, .max_filesize=10*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_dwg }; diff --git a/src/file_elf.c b/src/file_elf.c index caa0c681..10e10bca 100644 --- a/src/file_elf.c +++ b/src/file_elf.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_elf= { .min_header_distance=0, .max_filesize=10*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_elf }; diff --git a/src/file_emf.c b/src/file_emf.c index abdea9a1..9eb365b3 100644 --- a/src/file_emf.c +++ b/src/file_emf.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_emf= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_emf }; diff --git a/src/file_evt.c b/src/file_evt.c index 60c0664d..9764fbe6 100644 --- a/src/file_evt.c +++ b/src/file_evt.c @@ -42,6 +42,7 @@ const file_hint_t file_hint_evt= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_evt }; diff --git a/src/file_exe.c b/src/file_exe.c index 2d3565d3..ef0da406 100644 --- a/src/file_exe.c +++ b/src/file_exe.c @@ -42,6 +42,7 @@ const file_hint_t file_hint_exe= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_exe }; diff --git a/src/file_ext.c b/src/file_ext.c index 57e67112..ac01c3b0 100644 --- a/src/file_ext.c +++ b/src/file_ext.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_ext2_sb= { .min_header_distance=0, .max_filesize=1, .recover=0, + .enable_by_default=1, .register_header_check=®ister_header_check_ext2_sb }; diff --git a/src/file_fcp.c b/src/file_fcp.c index fac74252..49181684 100644 --- a/src/file_fcp.c +++ b/src/file_fcp.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_fcp= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_fcp }; diff --git a/src/file_fcs.c b/src/file_fcs.c index a4742230..8ca29fc9 100644 --- a/src/file_fcs.c +++ b/src/file_fcs.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_fcs= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_fcs }; diff --git a/src/file_fh10.c b/src/file_fh10.c index 225b26cf..a2c3acf5 100644 --- a/src/file_fh10.c +++ b/src/file_fh10.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_fh10= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_fh10 }; diff --git a/src/file_fh5.c b/src/file_fh5.c index 64cc0beb..385ecc27 100644 --- a/src/file_fh5.c +++ b/src/file_fh5.c @@ -49,6 +49,7 @@ const file_hint_t file_hint_fh5= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_fh5 }; diff --git a/src/file_flac.c b/src/file_flac.c index 8caada11..9d0176e7 100644 --- a/src/file_flac.c +++ b/src/file_flac.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_flac= { .min_header_distance=0, .max_filesize=100*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_flac }; diff --git a/src/file_flv.c b/src/file_flv.c index 9de0b159..1c08bb00 100644 --- a/src/file_flv.c +++ b/src/file_flv.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_flv= { .min_header_distance=0, .max_filesize=200*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_flv }; diff --git a/src/file_fs.c b/src/file_fs.c index 8846652d..9a156435 100644 --- a/src/file_fs.c +++ b/src/file_fs.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_fs= { .min_header_distance=0, .max_filesize=200*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_fs }; diff --git a/src/file_gif.c b/src/file_gif.c index a63ff9ee..cac71806 100644 --- a/src/file_gif.c +++ b/src/file_gif.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_gif= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_gif }; diff --git a/src/file_gz.c b/src/file_gz.c index 1d41b8c7..bfd680a1 100644 --- a/src/file_gz.c +++ b/src/file_gz.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_gz= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_gz }; diff --git a/src/file_imb.c b/src/file_imb.c index 9b04ec4d..8d1951ab 100644 --- a/src/file_imb.c +++ b/src/file_imb.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_imb= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_imb }; diff --git a/src/file_indd.c b/src/file_indd.c index e94c5e1c..19faf817 100644 --- a/src/file_indd.c +++ b/src/file_indd.c @@ -46,12 +46,13 @@ static void register_header_check_indd(file_stat_t *file_stat); static int header_check_indd(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 void file_check_indd(file_recovery_t *file_recovery); -file_hint_t file_hint_indd= { +const file_hint_t file_hint_indd= { .extension="indd", .description="InDesign File", .min_header_distance=8192, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_indd }; diff --git a/src/file_itu.c b/src/file_itu.c index 2ecfba0c..180855d0 100644 --- a/src/file_itu.c +++ b/src/file_itu.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_itunes= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_itunes }; static const unsigned char itunes_header[8]= {'m', 'h', 'b', 'd', 0x68, 0x00, 0x00, 0x00}; diff --git a/src/file_jpg.c b/src/file_jpg.c index 40e98ce1..7ce16620 100644 --- a/src/file_jpg.c +++ b/src/file_jpg.c @@ -50,6 +50,7 @@ const file_hint_t file_hint_jpg= { .min_header_distance=0, .max_filesize=50*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_jpg }; diff --git a/src/file_kdb.c b/src/file_kdb.c index f3859ac8..2b536b6e 100644 --- a/src/file_kdb.c +++ b/src/file_kdb.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_kdb= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_kdb }; diff --git a/src/file_lnk.c b/src/file_lnk.c index b5b71d8d..ba3a0dcb 100644 --- a/src/file_lnk.c +++ b/src/file_lnk.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_lnk= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_lnk }; diff --git a/src/file_max.c b/src/file_max.c index a824f1ce..dcd50480 100644 --- a/src/file_max.c +++ b/src/file_max.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_max= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_max }; diff --git a/src/file_mb.c b/src/file_mb.c index 7024a967..29e8697a 100644 --- a/src/file_mb.c +++ b/src/file_mb.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_mb= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_mb }; diff --git a/src/file_mcd.c b/src/file_mcd.c index ed1f17ca..9ded9451 100644 --- a/src/file_mcd.c +++ b/src/file_mcd.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_mcd= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_mcd }; diff --git a/src/file_mdb.c b/src/file_mdb.c index 0b51c42b..8753a404 100644 --- a/src/file_mdb.c +++ b/src/file_mdb.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_mdb= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_mdb }; @@ -50,6 +51,7 @@ const file_hint_t file_hint_accdb= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_accdb }; diff --git a/src/file_mdf.c b/src/file_mdf.c index e72189a3..0c615e74 100644 --- a/src/file_mdf.c +++ b/src/file_mdf.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_mdf= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_mdf }; diff --git a/src/file_mid.c b/src/file_mid.c index 44c3a202..0ac39a47 100644 --- a/src/file_mid.c +++ b/src/file_mid.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_mid= { .min_header_distance=0, .max_filesize=50*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_mid }; diff --git a/src/file_mkv.c b/src/file_mkv.c index 08405f4b..c78d2b98 100644 --- a/src/file_mkv.c +++ b/src/file_mkv.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_mkv= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_mkv }; diff --git a/src/file_mov.c b/src/file_mov.c index 0af73734..8a127730 100644 --- a/src/file_mov.c +++ b/src/file_mov.c @@ -43,6 +43,7 @@ const file_hint_t file_hint_mov= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_mov }; diff --git a/src/file_mp3.c b/src/file_mp3.c index d45bddb0..5178fb85 100644 --- a/src/file_mp3.c +++ b/src/file_mp3.c @@ -48,6 +48,7 @@ const file_hint_t file_hint_mp3= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_mp3 }; diff --git a/src/file_mpg.c b/src/file_mpg.c index c16aabf6..22f8e5b1 100644 --- a/src/file_mpg.c +++ b/src/file_mpg.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_mpg= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_mpg }; diff --git a/src/file_mrw.c b/src/file_mrw.c index ade7e530..e0e12833 100644 --- a/src/file_mrw.c +++ b/src/file_mrw.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_mrw= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_mrw }; diff --git a/src/file_mus.c b/src/file_mus.c index 031a3854..57c46f29 100644 --- a/src/file_mus.c +++ b/src/file_mus.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_mus= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_mus }; diff --git a/src/file_mysql.c b/src/file_mysql.c index f72b6de4..8cd874f0 100644 --- a/src/file_mysql.c +++ b/src/file_mysql.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_mysql= { .min_header_distance=0, .max_filesize=0, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_mysql }; diff --git a/src/file_njx.c b/src/file_njx.c index 1a991bf6..b37e4fc9 100644 --- a/src/file_njx.c +++ b/src/file_njx.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_njx= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_njx }; diff --git a/src/file_ogg.c b/src/file_ogg.c index 5ccf8412..675603b8 100644 --- a/src/file_ogg.c +++ b/src/file_ogg.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_ogg= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_ogg }; diff --git a/src/file_one.c b/src/file_one.c index bf45a660..4f67dad8 100644 --- a/src/file_one.c +++ b/src/file_one.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_one= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_one }; diff --git a/src/file_orf.c b/src/file_orf.c index 3f596d9b..dc28afff 100644 --- a/src/file_orf.c +++ b/src/file_orf.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_orf= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_orf }; diff --git a/src/file_pap.c b/src/file_pap.c index a9749604..18173daf 100644 --- a/src/file_pap.c +++ b/src/file_pap.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_pap= { .min_header_distance=0, .max_filesize=1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_pap }; diff --git a/src/file_pct.c b/src/file_pct.c index 9f4763d1..bf6a7dff 100644 --- a/src/file_pct.c +++ b/src/file_pct.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_pct= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_pct }; diff --git a/src/file_pcx.c b/src/file_pcx.c index 7f79f4d7..a4c459cb 100644 --- a/src/file_pcx.c +++ b/src/file_pcx.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_pcx= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_pcx }; diff --git a/src/file_pdf.c b/src/file_pdf.c index 84e60b9b..61e16a06 100644 --- a/src/file_pdf.c +++ b/src/file_pdf.c @@ -42,6 +42,7 @@ const file_hint_t file_hint_pdf= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_pdf }; diff --git a/src/file_png.c b/src/file_png.c index 9f6d4b23..2f477d06 100644 --- a/src/file_png.c +++ b/src/file_png.c @@ -47,6 +47,7 @@ const file_hint_t file_hint_png= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_png }; diff --git a/src/file_prc.c b/src/file_prc.c index 670867c9..b2e59b31 100644 --- a/src/file_prc.c +++ b/src/file_prc.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_prc= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_prc }; diff --git a/src/file_ps.c b/src/file_ps.c index de87472b..c3250a00 100644 --- a/src/file_ps.c +++ b/src/file_ps.c @@ -42,6 +42,7 @@ const file_hint_t file_hint_ps= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_ps }; diff --git a/src/file_psd.c b/src/file_psd.c index af849349..d781cfd1 100644 --- a/src/file_psd.c +++ b/src/file_psd.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_psd= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_psd }; diff --git a/src/file_pst.c b/src/file_pst.c index 58c516c8..6e3e4232 100644 --- a/src/file_pst.c +++ b/src/file_pst.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_pst= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_pst }; diff --git a/src/file_ptb.c b/src/file_ptb.c index 9c174599..25c5bf4e 100644 --- a/src/file_ptb.c +++ b/src/file_ptb.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_ptb= { .min_header_distance=0, .max_filesize=10*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_ptb }; diff --git a/src/file_qbb.c b/src/file_qbb.c index 6c08e0f8..3eb10005 100644 --- a/src/file_qbb.c +++ b/src/file_qbb.c @@ -42,6 +42,7 @@ const file_hint_t file_hint_qbb= { .min_header_distance=0, .max_filesize=30*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_qbb }; diff --git a/src/file_qdf.c b/src/file_qdf.c index ffb2963e..a35ee6d8 100644 --- a/src/file_qdf.c +++ b/src/file_qdf.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_qdf= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_qdf }; diff --git a/src/file_qxd.c b/src/file_qxd.c index a4150ba7..0a01a790 100644 --- a/src/file_qxd.c +++ b/src/file_qxd.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_qxd= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_qxd }; diff --git a/src/file_ra.c b/src/file_ra.c index 1932453a..2a2558f9 100644 --- a/src/file_ra.c +++ b/src/file_ra.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_ra= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_ra }; diff --git a/src/file_raf.c b/src/file_raf.c index ca5ce9cb..3aec1a18 100644 --- a/src/file_raf.c +++ b/src/file_raf.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_raf= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_raf }; diff --git a/src/file_rar.c b/src/file_rar.c index 3eed14cd..55a55484 100644 --- a/src/file_rar.c +++ b/src/file_rar.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_rar= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_rar }; diff --git a/src/file_raw.c b/src/file_raw.c index 8ba7e6fc..5919c6bd 100644 --- a/src/file_raw.c +++ b/src/file_raw.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_raw= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_raw }; diff --git a/src/file_rdc.c b/src/file_rdc.c index ea9a76b2..8575327e 100644 --- a/src/file_rdc.c +++ b/src/file_rdc.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_rdc= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_rdc }; diff --git a/src/file_reg.c b/src/file_reg.c index f9377e61..cf733e8e 100644 --- a/src/file_reg.c +++ b/src/file_reg.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_reg= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_reg }; diff --git a/src/file_res.c b/src/file_res.c index a5ed458a..a1456ef1 100644 --- a/src/file_res.c +++ b/src/file_res.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_res= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_res }; diff --git a/src/file_riff.c b/src/file_riff.c index a6736b2d..0c547bca 100644 --- a/src/file_riff.c +++ b/src/file_riff.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_riff= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_riff }; diff --git a/src/file_rm.c b/src/file_rm.c index e5641e12..eff184b5 100644 --- a/src/file_rm.c +++ b/src/file_rm.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_rm= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_rm }; diff --git a/src/file_rns.c b/src/file_rns.c index 7f2b9cb3..ae79031a 100644 --- a/src/file_rns.c +++ b/src/file_rns.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_rns= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_rns }; diff --git a/src/file_rpm.c b/src/file_rpm.c index 4f96bf98..33ba5c93 100644 --- a/src/file_rpm.c +++ b/src/file_rpm.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_rpm= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_rpm }; diff --git a/src/file_sit.c b/src/file_sit.c index 5ebc2c88..db950381 100644 --- a/src/file_sit.c +++ b/src/file_sit.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_sit= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_sit }; diff --git a/src/file_skp.c b/src/file_skp.c index d10c8fed..94c1aac7 100644 --- a/src/file_skp.c +++ b/src/file_skp.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_skp= { .min_header_distance=0, .max_filesize=10*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_skp }; diff --git a/src/file_spe.c b/src/file_spe.c index 04fd99d2..662a5bee 100644 --- a/src/file_spe.c +++ b/src/file_spe.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_spe= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_spe }; diff --git a/src/file_spss.c b/src/file_spss.c index e64222c5..0d5126aa 100644 --- a/src/file_spss.c +++ b/src/file_spss.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_spss= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_spss }; diff --git a/src/file_stu.c b/src/file_stu.c index 167f0e56..a839378c 100644 --- a/src/file_stu.c +++ b/src/file_stu.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_stuffit= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_stuffit }; diff --git a/src/file_swf.c b/src/file_swf.c index 49baeb5a..22c85d8e 100644 --- a/src/file_swf.c +++ b/src/file_swf.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_swf= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_swf }; diff --git a/src/file_tar.c b/src/file_tar.c index 78140321..f06f13fe 100644 --- a/src/file_tar.c +++ b/src/file_tar.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_tar= { .min_header_distance=0x200, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_tar }; diff --git a/src/file_tib.c b/src/file_tib.c index 56042c66..617007e8 100644 --- a/src/file_tib.c +++ b/src/file_tib.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_tib= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_tib }; diff --git a/src/file_tiff.c b/src/file_tiff.c index 2592ee3c..077bca74 100644 --- a/src/file_tiff.c +++ b/src/file_tiff.c @@ -44,6 +44,7 @@ const file_hint_t file_hint_tiff= { .min_header_distance=0, .max_filesize=200*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_tiff }; diff --git a/src/file_txt.c b/src/file_txt.c index abfd8214..ec63b814 100644 --- a/src/file_txt.c +++ b/src/file_txt.c @@ -56,21 +56,23 @@ static void file_check_html(file_recovery_t *file_recovery); static void file_check_emlx(file_recovery_t *file_recovery); static void file_check_xml(file_recovery_t *file_recovery); -file_hint_t file_hint_fasttxt= { +const file_hint_t file_hint_fasttxt= { .extension="tx?", .description="Text files with header: rtf,xml,xhtml,imm,pm,reg,sh,slk,ram", .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_fasttxt }; -file_hint_t file_hint_txt= { +const file_hint_t file_hint_txt= { .extension="txt", .description="Other text files: txt,html,asp,bat,C,jsp,perl,php,py... scripts", .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_txt }; diff --git a/src/file_vmdk.c b/src/file_vmdk.c index 5844ac79..ed09d762 100644 --- a/src/file_vmdk.c +++ b/src/file_vmdk.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_vmdk= { .min_header_distance=0, .max_filesize=(uint64_t)2048*1024*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_vmdk }; diff --git a/src/file_wmf.c b/src/file_wmf.c index 65813afa..9f7d3a94 100644 --- a/src/file_wmf.c +++ b/src/file_wmf.c @@ -41,6 +41,7 @@ const file_hint_t file_hint_wmf= { .min_header_distance=0, .max_filesize=50*1024*1024, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_wmf }; diff --git a/src/file_wpd.c b/src/file_wpd.c index 017f9bdd..f9b2a26f 100644 --- a/src/file_wpd.c +++ b/src/file_wpd.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_wpd= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_wpd }; diff --git a/src/file_x3f.c b/src/file_x3f.c index 8d44d0d7..f022b4d2 100644 --- a/src/file_x3f.c +++ b/src/file_x3f.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_x3f= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_x3f }; diff --git a/src/file_xcf.c b/src/file_xcf.c index 9154085c..2fb6baab 100644 --- a/src/file_xcf.c +++ b/src/file_xcf.c @@ -39,6 +39,7 @@ const file_hint_t file_hint_xcf= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_xcf }; diff --git a/src/file_xm.c b/src/file_xm.c index 84ab3915..7816b115 100644 --- a/src/file_xm.c +++ b/src/file_xm.c @@ -42,6 +42,7 @@ const file_hint_t file_hint_xm= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_xm }; diff --git a/src/file_xsv.c b/src/file_xsv.c index 716b7cbf..1831bba9 100644 --- a/src/file_xsv.c +++ b/src/file_xsv.c @@ -40,6 +40,7 @@ const file_hint_t file_hint_xsv= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_xsv }; diff --git a/src/file_zip.c b/src/file_zip.c index a61118c2..66e5f3e8 100644 --- a/src/file_zip.c +++ b/src/file_zip.c @@ -52,6 +52,7 @@ const file_hint_t file_hint_zip= { .min_header_distance=0, .max_filesize=PHOTOREC_MAX_FILE_SIZE, .recover=1, + .enable_by_default=1, .register_header_check=®ister_header_check_zip }; diff --git a/src/filegen.h b/src/filegen.h index d45034ca..3cec6713 100644 --- a/src/filegen.h +++ b/src/filegen.h @@ -83,6 +83,7 @@ struct file_hint_struct /* needed by tar header */ const uint64_t max_filesize; const int recover; + const int enable_by_default; void (*register_header_check)(file_stat_t *file_stat); }; diff --git a/src/photorec.c b/src/photorec.c index 039a9df0..71f4f0e4 100644 --- a/src/photorec.c +++ b/src/photorec.c @@ -745,6 +745,13 @@ alloc_data_t * update_blocksize(unsigned int blocksize, alloc_data_t *list_searc return list_search_space; } +void reset_list_file_enable(file_enable_t *files_enable) +{ + file_enable_t *file_enable; + for(file_enable=files_enable;file_enable->file_hint!=NULL;file_enable++) + file_enable->enable=file_enable->file_hint->enable_by_default; +} + int main( int argc, char **argv ) { int i; @@ -770,118 +777,118 @@ int main( int argc, char **argv ) #endif file_enable_t list_file_enable[]= { - { .enable=1, .file_hint=&file_hint_7z }, - { .enable=1, .file_hint=&file_hint_a }, - { .enable=1, .file_hint=&file_hint_accdb}, - { .enable=1, .file_hint=&file_hint_ace }, - { .enable=1, .file_hint=&file_hint_addressbook}, - { .enable=1, .file_hint=&file_hint_aif }, - { .enable=1, .file_hint=&file_hint_all }, - { .enable=1, .file_hint=&file_hint_asf }, - { .enable=1, .file_hint=&file_hint_au }, - { .enable=1, .file_hint=&file_hint_bkf }, - { .enable=1, .file_hint=&file_hint_blend }, - { .enable=1, .file_hint=&file_hint_bmp }, - { .enable=1, .file_hint=&file_hint_bz2 }, - { .enable=1, .file_hint=&file_hint_cab }, - { .enable=1, .file_hint=&file_hint_cam }, - { .enable=1, .file_hint=&file_hint_cm }, - { .enable=1, .file_hint=&file_hint_crw }, - { .enable=1, .file_hint=&file_hint_ctg }, - { .enable=1, .file_hint=&file_hint_cwk }, - { .enable=1, .file_hint=&file_hint_dat }, + { .enable=0, .file_hint=&file_hint_7z }, + { .enable=0, .file_hint=&file_hint_a }, + { .enable=0, .file_hint=&file_hint_accdb}, + { .enable=0, .file_hint=&file_hint_ace }, + { .enable=0, .file_hint=&file_hint_addressbook}, + { .enable=0, .file_hint=&file_hint_aif }, + { .enable=0, .file_hint=&file_hint_all }, + { .enable=0, .file_hint=&file_hint_asf }, + { .enable=0, .file_hint=&file_hint_au }, + { .enable=0, .file_hint=&file_hint_bkf }, + { .enable=0, .file_hint=&file_hint_blend }, + { .enable=0, .file_hint=&file_hint_bmp }, + { .enable=0, .file_hint=&file_hint_bz2 }, + { .enable=0, .file_hint=&file_hint_cab }, + { .enable=0, .file_hint=&file_hint_cam }, + { .enable=0, .file_hint=&file_hint_cm }, + { .enable=0, .file_hint=&file_hint_crw }, + { .enable=0, .file_hint=&file_hint_ctg }, + { .enable=0, .file_hint=&file_hint_cwk }, + { .enable=0, .file_hint=&file_hint_dat }, { .enable=0, .file_hint=&file_hint_dbf }, - { .enable=1, .file_hint=&file_hint_dim }, - { .enable=1, .file_hint=&file_hint_dir }, - { .enable=1, .file_hint=&file_hint_djv }, - { .enable=1, .file_hint=&file_hint_doc }, - { .enable=1, .file_hint=&file_hint_dpx }, - { .enable=1, .file_hint=&file_hint_dsc }, - { .enable=1, .file_hint=&file_hint_dss }, + { .enable=0, .file_hint=&file_hint_dim }, + { .enable=0, .file_hint=&file_hint_dir }, + { .enable=0, .file_hint=&file_hint_djv }, + { .enable=0, .file_hint=&file_hint_doc }, + { .enable=0, .file_hint=&file_hint_dpx }, + { .enable=0, .file_hint=&file_hint_dsc }, + { .enable=0, .file_hint=&file_hint_dss }, { .enable=0, .file_hint=&file_hint_dta }, - { .enable=1, .file_hint=&file_hint_dump }, - { .enable=1, .file_hint=&file_hint_dv }, - { .enable=1, .file_hint=&file_hint_dwg }, - { .enable=1, .file_hint=&file_hint_elf }, - { .enable=1, .file_hint=&file_hint_emf }, - { .enable=1, .file_hint=&file_hint_evt }, - { .enable=1, .file_hint=&file_hint_exe }, - { .enable=1, .file_hint=&file_hint_ext2_sb }, - { .enable=1, .file_hint=&file_hint_fcp }, - { .enable=1, .file_hint=&file_hint_fcs }, - { .enable=1, .file_hint=&file_hint_fh10 }, - { .enable=1, .file_hint=&file_hint_fh5 }, - { .enable=1, .file_hint=&file_hint_flac }, - { .enable=1, .file_hint=&file_hint_flv }, - { .enable=1, .file_hint=&file_hint_fs }, - { .enable=1, .file_hint=&file_hint_gif }, - { .enable=1, .file_hint=&file_hint_gz }, - { .enable=1, .file_hint=&file_hint_imb }, - { .enable=1, .file_hint=&file_hint_indd }, - { .enable=1, .file_hint=&file_hint_itunes }, - { .enable=1, .file_hint=&file_hint_kdb }, - { .enable=1, .file_hint=&file_hint_lnk }, - { .enable=1, .file_hint=&file_hint_jpg }, - { .enable=1, .file_hint=&file_hint_max }, - { .enable=1, .file_hint=&file_hint_mb }, - { .enable=1, .file_hint=&file_hint_mcd }, - { .enable=1, .file_hint=&file_hint_mdb }, - { .enable=1, .file_hint=&file_hint_mdf }, - { .enable=1, .file_hint=&file_hint_mid }, - { .enable=1, .file_hint=&file_hint_mkv }, - { .enable=1, .file_hint=&file_hint_mov }, - { .enable=1, .file_hint=&file_hint_mp3 }, - { .enable=1, .file_hint=&file_hint_mpg }, - { .enable=1, .file_hint=&file_hint_mrw }, - { .enable=1, .file_hint=&file_hint_mus }, - { .enable=1, .file_hint=&file_hint_mysql }, - { .enable=1, .file_hint=&file_hint_njx }, - { .enable=1, .file_hint=&file_hint_ogg }, - { .enable=1, .file_hint=&file_hint_one }, - { .enable=1, .file_hint=&file_hint_orf }, - { .enable=1, .file_hint=&file_hint_pap }, - { .enable=1, .file_hint=&file_hint_pct }, - { .enable=1, .file_hint=&file_hint_pcx }, - { .enable=1, .file_hint=&file_hint_pdf }, - { .enable=1, .file_hint=&file_hint_png }, - { .enable=1, .file_hint=&file_hint_prc }, - { .enable=1, .file_hint=&file_hint_ps }, - { .enable=1, .file_hint=&file_hint_psd }, - { .enable=1, .file_hint=&file_hint_pst }, - { .enable=1, .file_hint=&file_hint_ptb }, - { .enable=1, .file_hint=&file_hint_qbb }, - { .enable=1, .file_hint=&file_hint_qdf }, - { .enable=1, .file_hint=&file_hint_qxd }, - { .enable=1, .file_hint=&file_hint_ra }, - { .enable=1, .file_hint=&file_hint_raf }, - { .enable=1, .file_hint=&file_hint_rar }, - { .enable=1, .file_hint=&file_hint_raw }, - { .enable=1, .file_hint=&file_hint_rdc }, - { .enable=1, .file_hint=&file_hint_reg }, - { .enable=1, .file_hint=&file_hint_res }, - { .enable=1, .file_hint=&file_hint_riff }, - { .enable=1, .file_hint=&file_hint_rm }, - { .enable=1, .file_hint=&file_hint_rns }, - { .enable=1, .file_hint=&file_hint_rpm }, - { .enable=1, .file_hint=&file_hint_sit }, - { .enable=1, .file_hint=&file_hint_skp }, - { .enable=1, .file_hint=&file_hint_spe }, - { .enable=1, .file_hint=&file_hint_spss }, - { .enable=1, .file_hint=&file_hint_stuffit }, - { .enable=1, .file_hint=&file_hint_swf }, - { .enable=1, .file_hint=&file_hint_tar }, - { .enable=1, .file_hint=&file_hint_tib }, - { .enable=1, .file_hint=&file_hint_tiff }, - { .enable=1, .file_hint=&file_hint_fasttxt }, - { .enable=1, .file_hint=&file_hint_txt }, - { .enable=1, .file_hint=&file_hint_vmdk }, - { .enable=1, .file_hint=&file_hint_wpd }, - { .enable=1, .file_hint=&file_hint_wmf }, - { .enable=1, .file_hint=&file_hint_x3f }, - { .enable=1, .file_hint=&file_hint_xcf }, - { .enable=1, .file_hint=&file_hint_xm }, - { .enable=1, .file_hint=&file_hint_xsv }, - { .enable=1, .file_hint=&file_hint_zip }, + { .enable=0, .file_hint=&file_hint_dump }, + { .enable=0, .file_hint=&file_hint_dv }, + { .enable=0, .file_hint=&file_hint_dwg }, + { .enable=0, .file_hint=&file_hint_elf }, + { .enable=0, .file_hint=&file_hint_emf }, + { .enable=0, .file_hint=&file_hint_evt }, + { .enable=0, .file_hint=&file_hint_exe }, + { .enable=0, .file_hint=&file_hint_ext2_sb }, + { .enable=0, .file_hint=&file_hint_fcp }, + { .enable=0, .file_hint=&file_hint_fcs }, + { .enable=0, .file_hint=&file_hint_fh10 }, + { .enable=0, .file_hint=&file_hint_fh5 }, + { .enable=0, .file_hint=&file_hint_flac }, + { .enable=0, .file_hint=&file_hint_flv }, + { .enable=0, .file_hint=&file_hint_fs }, + { .enable=0, .file_hint=&file_hint_gif }, + { .enable=0, .file_hint=&file_hint_gz }, + { .enable=0, .file_hint=&file_hint_imb }, + { .enable=0, .file_hint=&file_hint_indd }, + { .enable=0, .file_hint=&file_hint_itunes }, + { .enable=0, .file_hint=&file_hint_kdb }, + { .enable=0, .file_hint=&file_hint_lnk }, + { .enable=0, .file_hint=&file_hint_jpg }, + { .enable=0, .file_hint=&file_hint_max }, + { .enable=0, .file_hint=&file_hint_mb }, + { .enable=0, .file_hint=&file_hint_mcd }, + { .enable=0, .file_hint=&file_hint_mdb }, + { .enable=0, .file_hint=&file_hint_mdf }, + { .enable=0, .file_hint=&file_hint_mid }, + { .enable=0, .file_hint=&file_hint_mkv }, + { .enable=0, .file_hint=&file_hint_mov }, + { .enable=0, .file_hint=&file_hint_mp3 }, + { .enable=0, .file_hint=&file_hint_mpg }, + { .enable=0, .file_hint=&file_hint_mrw }, + { .enable=0, .file_hint=&file_hint_mus }, + { .enable=0, .file_hint=&file_hint_mysql }, + { .enable=0, .file_hint=&file_hint_njx }, + { .enable=0, .file_hint=&file_hint_ogg }, + { .enable=0, .file_hint=&file_hint_one }, + { .enable=0, .file_hint=&file_hint_orf }, + { .enable=0, .file_hint=&file_hint_pap }, + { .enable=0, .file_hint=&file_hint_pct }, + { .enable=0, .file_hint=&file_hint_pcx }, + { .enable=0, .file_hint=&file_hint_pdf }, + { .enable=0, .file_hint=&file_hint_png }, + { .enable=0, .file_hint=&file_hint_prc }, + { .enable=0, .file_hint=&file_hint_ps }, + { .enable=0, .file_hint=&file_hint_psd }, + { .enable=0, .file_hint=&file_hint_pst }, + { .enable=0, .file_hint=&file_hint_ptb }, + { .enable=0, .file_hint=&file_hint_qbb }, + { .enable=0, .file_hint=&file_hint_qdf }, + { .enable=0, .file_hint=&file_hint_qxd }, + { .enable=0, .file_hint=&file_hint_ra }, + { .enable=0, .file_hint=&file_hint_raf }, + { .enable=0, .file_hint=&file_hint_rar }, + { .enable=0, .file_hint=&file_hint_raw }, + { .enable=0, .file_hint=&file_hint_rdc }, + { .enable=0, .file_hint=&file_hint_reg }, + { .enable=0, .file_hint=&file_hint_res }, + { .enable=0, .file_hint=&file_hint_riff }, + { .enable=0, .file_hint=&file_hint_rm }, + { .enable=0, .file_hint=&file_hint_rns }, + { .enable=0, .file_hint=&file_hint_rpm }, + { .enable=0, .file_hint=&file_hint_sit }, + { .enable=0, .file_hint=&file_hint_skp }, + { .enable=0, .file_hint=&file_hint_spe }, + { .enable=0, .file_hint=&file_hint_spss }, + { .enable=0, .file_hint=&file_hint_stuffit }, + { .enable=0, .file_hint=&file_hint_swf }, + { .enable=0, .file_hint=&file_hint_tar }, + { .enable=0, .file_hint=&file_hint_tib }, + { .enable=0, .file_hint=&file_hint_tiff }, + { .enable=0, .file_hint=&file_hint_fasttxt }, + { .enable=0, .file_hint=&file_hint_txt }, + { .enable=0, .file_hint=&file_hint_vmdk }, + { .enable=0, .file_hint=&file_hint_wpd }, + { .enable=0, .file_hint=&file_hint_wmf }, + { .enable=0, .file_hint=&file_hint_x3f }, + { .enable=0, .file_hint=&file_hint_xcf }, + { .enable=0, .file_hint=&file_hint_xm }, + { .enable=0, .file_hint=&file_hint_xsv }, + { .enable=0, .file_hint=&file_hint_zip }, { .enable=0, .file_hint=NULL } }; /* random (weak is ok) is need fot GPT */ @@ -1044,6 +1051,7 @@ int main( int argc, char **argv ) disk->description(disk), disk->sector_size, disk->model); } log_info("\n"); + reset_list_file_enable(list_file_enable); use_sudo=do_curses_photorec(verbose, recup_dir, list_disk, list_file_enable, cmd_device, &cmd_run); #ifdef HAVE_NCURSES end_ncurses(); diff --git a/src/phrecn.c b/src/phrecn.c index a4ae1c73..4712a6ee 100644 --- a/src/phrecn.c +++ b/src/phrecn.c @@ -1997,6 +1997,7 @@ static void interface_file_select_ncurses(file_enable_t *files_enable) int offset=0; int rewrite=1; unsigned int menu=0; + int enable_status=files_enable[0].enable; static struct MenuItem menuAdv[]= { {'q',"Quit","Return to main menu"}, @@ -2009,17 +2010,17 @@ static void interface_file_select_ncurses(file_enable_t *files_enable) if(rewrite!=0) { aff_copy(stdscr); - wmove(stdscr,5,0); + wmove(stdscr,4,0); wprintw(stdscr,"PhotoRec will try to locate the following files"); rewrite=0; } - wmove(stdscr,5+1,4); + wmove(stdscr,5,4); wclrtoeol(stdscr); if(offset>0) wprintw(stdscr,"Previous"); for(i=offset;files_enable[i].file_hint!=NULL && ((i-offset)<INTER_SELECT);i++) { - wmove(stdscr,5+2+i-offset,0); + wmove(stdscr,6+i-offset,0); wclrtoeol(stdscr); /* before addstr for BSD compatibility */ if(i==current_element_num) { @@ -2037,10 +2038,22 @@ static void interface_file_select_ncurses(file_enable_t *files_enable) files_enable[i].file_hint->description); } } - wmove(stdscr,5+2+INTER_SELECT,4); + wmove(stdscr,6+INTER_SELECT,4); wclrtoeol(stdscr); /* before addstr for BSD compatibility */ if(files_enable[i].file_hint!=NULL) wprintw(stdscr,"Next"); + wmove(stdscr,6+INTER_SELECT+1,0); + wclrtoeol(stdscr); + wprintw(stdscr,"Press "); + if(has_colors()) + wbkgdset(stdscr,' ' | A_BOLD | COLOR_PAIR(0)); + wprintw(stdscr,"s"); + if(has_colors()) + wbkgdset(stdscr,' ' | COLOR_PAIR(0)); + if(enable_status==0) + wprintw(stdscr," for default selection"); + else + wprintw(stdscr," to disable all file famillies"); command = wmenuSelect(stdscr,INTER_SELECT_Y, INTER_SELECT_X, menuAdv, 8, "q", MENU_BUTTON | MENU_ACCEPT_OTHERS, menu); switch(command) @@ -2089,10 +2102,15 @@ static void interface_file_select_ncurses(file_enable_t *files_enable) case 's': case 'S': { - file_enable_t *file_enable; - int enable_status=1-files_enable[0].enable; - for(file_enable=&files_enable[0];file_enable->file_hint!=NULL;file_enable++) - file_enable->enable=enable_status; + enable_status=1-enable_status; + if(enable_status==0) + { + file_enable_t *file_enable; + for(file_enable=&files_enable[0];file_enable->file_hint!=NULL;file_enable++) + file_enable->enable=0; + } + else + reset_list_file_enable(files_enable); } break; case 'q': |