summaryrefslogtreecommitdiffstats
path: root/src/parti386.c
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2011-03-05 18:40:22 +0100
committerChristophe Grenier <grenier@cgsecurity.org>2011-03-05 18:40:22 +0100
commitf2c0943a5a5d2de868a6cfefa8b2c7386b8c5393 (patch)
tree067af5958b2777c67cc7811390d04f0cdc2e0675 /src/parti386.c
parent237b0d53ac0d638ccbd8671293b6695436bad32c (diff)
TestDisk: recover btrfs, a GPL-licensed copy-on-write file system for Linux.
Diffstat (limited to 'src/parti386.c')
-rw-r--r--src/parti386.c46
1 files changed, 10 insertions, 36 deletions
diff --git a/src/parti386.c b/src/parti386.c
index 7f0a98c..b63ab74 100644
--- a/src/parti386.c
+++ b/src/parti386.c
@@ -40,25 +40,19 @@
#include "intrf.h"
#include "chgtype.h"
#include "savehdr.h"
+#include "analyse.h"
#include "bfs.h"
#include "bsd.h"
-#include "cramfs.h"
#include "exfat.h"
-#include "ext2.h"
#include "fat.h"
#include "hfs.h"
#include "hfsp.h"
-#include "jfs_superblock.h"
-#include "jfs.h"
-#include "luks.h"
#include "lvm.h"
#include "md.h"
#include "netware.h"
#include "ntfs.h"
-#include "rfs.h"
#include "sun.h"
#include "swap.h"
-#include "xfs.h"
#include "log.h"
#include "parti386.h"
#include "partgpt.h"
@@ -1522,36 +1516,16 @@ static int check_part_i386(disk_t *disk_car,const int verbose,partition_t *parti
{ screen_buffer_add("Invalid BSD disklabel\n"); }
break;
case P_HFS:
- ret=check_HFS(disk_car,partition,verbose);
+ ret=check_HFS(disk_car, partition, verbose);
if(ret!=0)
- {
- ret=check_HFSP(disk_car,partition,verbose);
- }
+ ret=check_HFSP(disk_car, partition, verbose);
+ if(ret!=0)
+ screen_buffer_add("No HFS or HFS+ structure\n");
break;
case P_LINUX:
- ret=check_JFS(disk_car, partition);
- if(ret!=0)
- {
- ret=check_rfs(disk_car,partition,verbose);
- }
+ ret=check_linux(disk_car, partition, verbose);
if(ret!=0)
- {
- ret=check_EXT2(disk_car,partition,verbose);
- }
- if(ret!=0)
- {
- ret=check_cramfs(disk_car,partition,verbose);
- }
- if(ret!=0)
- {
- ret=check_xfs(disk_car,partition,verbose);
- }
- if(ret!=0)
- {
- ret=check_LUKS(disk_car,partition);
- }
- if(ret!=0)
- { screen_buffer_add("No EXT2, JFS, Reiser, cramfs or XFS marker\n"); }
+ screen_buffer_add("No ext2, JFS, Reiser, cramfs or XFS marker\n");
break;
case P_LINSWAP:
ret=check_Linux_SWAP(disk_car, partition);
@@ -1559,9 +1533,9 @@ static int check_part_i386(disk_t *disk_car,const int verbose,partition_t *parti
case P_LVM:
ret=check_LVM(disk_car,partition,verbose);
if(ret!=0)
- {
ret=check_LVM2(disk_car,partition,verbose);
- }
+ if(ret!=0)
+ screen_buffer_add("No LVM or LVM2 structure\n");
break;
case P_NETBSD:
ret=check_BSD(disk_car,partition,verbose,BSD_MAXPARTITIONS);
@@ -1582,7 +1556,7 @@ static int check_part_i386(disk_t *disk_car,const int verbose,partition_t *parti
case P_RAID:
ret=check_MD(disk_car,partition,verbose);
if(ret!=0)
- { screen_buffer_add("Invalid RAID superblock\n"); }
+ screen_buffer_add("Invalid RAID superblock\n");
break;
case P_SUN:
ret=check_sun_i386(disk_car,partition,verbose);