summaryrefslogtreecommitdiffstats
path: root/src/partsun.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/partsun.c
parent237b0d53ac0d638ccbd8671293b6695436bad32c (diff)
TestDisk: recover btrfs, a GPL-licensed copy-on-write file system for Linux.
Diffstat (limited to 'src/partsun.c')
-rw-r--r--src/partsun.c39
1 files changed, 11 insertions, 28 deletions
diff --git a/src/partsun.c b/src/partsun.c
index b6ddce5..5ce33df 100644
--- a/src/partsun.c
+++ b/src/partsun.c
@@ -38,21 +38,13 @@
#include "fnctdsk.h"
#include "lang.h"
#include "intrf.h"
+#include "analyse.h"
#include "chgtype.h"
#include "sun.h"
#include "swap.h"
-#include "bsd.h"
-#include "fat.h"
-#include "ntfs.h"
-#include "ext2.h"
-#include "rfs.h"
#include "lvm.h"
#include "md.h"
-#include "jfs_superblock.h"
-#include "jfs.h"
#include "savehdr.h"
-#include "cramfs.h"
-#include "xfs.h"
#include "ufs.h"
#include "log.h"
#include "partsun.h"
@@ -354,30 +346,21 @@ static int check_part_sun(disk_t *disk_car,const int verbose,partition_t *partit
ret=check_ufs(disk_car,partition,verbose);
break;
case PSUN_LINUX:
- ret=check_JFS(disk_car, partition);
+ ret=check_linux(disk_car, partition, verbose);
if(ret!=0)
- {
- ret=check_rfs(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)
- { 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 PSUN_LINSWAP:
ret=check_Linux_SWAP(disk_car, partition);
break;
+ case PSUN_LVM:
+ ret=check_LVM(disk_car,partition,verbose);
+ if(ret!=0)
+ ret=check_LVM2(disk_car,partition,verbose);
+ break;
+ case PSUN_RAID:
+ ret=check_MD(disk_car,partition,verbose);
+ break;
default:
if(verbose>0)
{