summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2008-03-24 16:26:32 +0100
committerChristophe Grenier <grenier@cgsecurity.org>2008-03-24 16:26:32 +0100
commit5f39b5f995633c1afc73dddeff22fd695b3cfd46 (patch)
treeee3ba84b845bb77c080607ff2e721ed0e1b0e7a5 /src
parentef4104d8ce3c3ead52bff12bf7905e8fc094533b (diff)
Move rebuild_FAT_BS, FAT_init_rootdir and repair_FAT_table headers to fat_adv.h
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/adv.c1
-rw-r--r--src/common.h1
-rw-r--r--src/fat.h2
-rw-r--r--src/fat_adv.c1
-rw-r--r--src/fat_adv.h27
6 files changed, 30 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d5c5ac..35ea4f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ base_H = common.h crc.h ewf.h fnctdsk.h hdaccess.h guid_cmp.h guid_cpy.h hdcac
fs_C = analyse.c bfs.c bsd.c cramfs.c fat.c fatx.c ext2.c jfs.c hfs.c hfsp.c luks.c lvm.c md.c netware.c ntfs.c rfs.c savehdr.c sun.c swap.c sysv.c ufs.c xfs.c
fs_H = analyse.h bfs.h bsd.h cramfs.h fat.h fatx.h ext2.h jfs_superblock.h jfs.h hfs.h hfsp.h luks.h lvm.h md.h netware.h ntfs.h rfs.h savehdr.h sun.h swap.h sysv.h ufs.h xfs.h
-testdisk_SOURCES = testdisk.c $(base_C) $(base_H) $(fs_C) $(fs_H) testdisk.h adv.c adv.h dir.c dir.h dirpart.c dirpart.h edit.c edit.h ext2_dir.c ext2_dir.h ext2_inc.h fat_adv.c fat_dir.c fat_dir.h geometry.c godmode.c godmode.h intrface.c intrface.h ntfs_adv.c ntfs_dir.c ntfs_dir.h ntfs_fix.c ntfs_inc.h rfs_dir.c rfs_dir.h $(ICON_TESTDISK) next.c next.h dimage.c dimage.h
+testdisk_SOURCES = testdisk.c $(base_C) $(base_H) $(fs_C) $(fs_H) testdisk.h adv.c adv.h dir.c dir.h dirpart.c dirpart.h edit.c edit.h ext2_dir.c ext2_dir.h ext2_inc.h fat_adv.c fat_adv.h fat_dir.c fat_dir.h geometry.c godmode.c godmode.h intrface.c intrface.h ntfs_adv.c ntfs_dir.c ntfs_dir.h ntfs_fix.c ntfs_inc.h rfs_dir.c rfs_dir.h $(ICON_TESTDISK) next.c next.h dimage.c dimage.h
#ntfs_udl.c ntfs_udl.h
photorec_SOURCES = photorec.c photorec.h phcfg.c phcfg.h phrecn.c phrecn.h dir.c dir.h ext2p.c ext2p.h ext2_dir.c ext2_dir.h ext2_inc.h fat_dir.c fat_dir.h fatp.c fatp.h filegen.c filegen.h file_7z.c file_a.c file_ab.c file_ace.c file_aif.c file_all.c file_asf.c file_au.c file_bkf.c file_bld.c file_bmp.c file_bz2.c file_cab.c file_cam.c file_cm.c file_crw.c file_ctg.c file_cwk.c file_dat.c file_dbf.c file_dim.c file_dir.c file_djv.c file_doc.c file_dpx.c file_dsc.c file_dss.c file_dta.c file_dv.c file_dwg.c file_elf.c file_emf.c file_evt.c file_exe.c pe.h file_ext.c file_fcp.c file_fcs.c file_fh10.c file_fh5.c file_flac.c file_flv.c file_fs.c file_gho.c file_gif.c file_gz.c file_imb.c file_indd.c file_dump.c file_itu.c file_jpg.c file_jpg.h file_kdb.c file_lnk.c file_max.c file_mb.c file_mcd.c file_mdb.c file_mdf.c file_mid.c file_mkv.c file_mov.c file_mp3.c file_mpg.c file_mrw.c file_mus.c file_mysql.c file_njx.c file_ogg.c file_one.c file_orf.c file_pap.c file_pct.c file_pcx.c file_pdf.c file_png.c file_prc.c file_ps.c file_psd.c file_pst.c file_ptb.c file_qbb.c file_qdf.c file_qxd.c file_ra.c file_raf.c file_rar.c file_raw.c file_rdc.c file_reg.c file_res.c file_riff.c file_rm.c file_rns.c file_rpm.c file_sit.c file_skp.c file_spe.c file_spss.c file_stu.c file_swf.c file_tar.c file_tar.h file_tib.c file_tiff.c file_txt.c file_vmdk.c file_wpd.c file_wmf.c file_x3f.c file_xcf.c file_xm.c file_xsv.c file_zip.c memmem.h geometry.c list.c list.h ole.h ntfs_dir.c ntfs_dir.h ntfsp.c ntfsp.h ntfs_inc.h sessionp.c sessionp.h $(base_C) $(base_H) $(fs_C) $(fs_H) $(ICON_PHOTOREC)
diff --git a/src/adv.c b/src/adv.c
index d99f246..a8adb3f 100644
--- a/src/adv.c
+++ b/src/adv.c
@@ -51,6 +51,7 @@
#include "log.h"
#include "guid_cmp.h"
#include "dimage.h"
+#include "fat_adv.h"
extern const arch_fnct_t arch_gpt;
extern const arch_fnct_t arch_i386;
diff --git a/src/common.h b/src/common.h
index 1cc38fb..ff16edb 100644
--- a/src/common.h
+++ b/src/common.h
@@ -356,7 +356,6 @@ char test_key(void);
unsigned int up2power(const unsigned int number);
void my_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *));
void set_part_name(partition_t *partition,const char *src,const int max_size);
-int rebuild_FAT_BS(disk_t *disk_car,partition_t *partition, const int verbose, const int dump_ind,const int interface, const unsigned int expert, char**current_cmd);
#ifndef BSD_MAXPARTITIONS
#define BSD_MAXPARTITIONS 8
#endif
diff --git a/src/fat.h b/src/fat.h
index b439e02..a5a54bc 100644
--- a/src/fat.h
+++ b/src/fat.h
@@ -125,8 +125,6 @@ unsigned int fat32_get_prev_cluster(disk_t *disk_car,const partition_t *partitio
int fat32_free_info(disk_t *disk_car,const partition_t *partition, const unsigned int fat_offset, const unsigned int no_of_cluster, unsigned int *next_free, unsigned int*free_count);
unsigned long int fat32_get_free_count(const unsigned char *boot_fat32, const unsigned int sector_size);
unsigned long int fat32_get_next_free(const unsigned char *boot_fat32, const unsigned int sector_size);
-int repair_FAT_table(disk_t *disk_car, partition_t *partition, const int verbose);
-int FAT_init_rootdir(disk_t *disk_car, partition_t *partition, const int verbose);
#define DELETED_FLAG 0xe5 /* marks file as deleted when in name[0] */
#define IS_FREE(n) (!*(n) || *(const unsigned char *) (n) == DELETED_FLAG)
diff --git a/src/fat_adv.c b/src/fat_adv.c
index 914d8cb..55076fa 100644
--- a/src/fat_adv.c
+++ b/src/fat_adv.c
@@ -54,6 +54,7 @@
#include "fat_dir.h"
#include "io_redir.h"
#include "log.h"
+#include "fat_adv.h"
#define INTER_FAT_ASK_X 0
#define INTER_FAT_ASK_Y 23
diff --git a/src/fat_adv.h b/src/fat_adv.h
new file mode 100644
index 0000000..d18379a
--- /dev/null
+++ b/src/fat_adv.h
@@ -0,0 +1,27 @@
+/*
+
+ File: fat_adv.h
+
+ Copyright (C) 2008 Christophe GRENIER <grenier@cgsecurity.org>
+
+ 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.
+
+ */
+#ifndef _FAT_ADV_H
+#define _FAT_ADV_H
+int rebuild_FAT_BS(disk_t *disk_car,partition_t *partition, const int verbose, const int dump_ind,const int interface, const unsigned int expert, char**current_cmd);
+int FAT_init_rootdir(disk_t *disk_car, partition_t *partition, const int verbose);
+int repair_FAT_table(disk_t *disk_car, partition_t *partition, const int verbose);
+#endif