1 files changed, 41 insertions, 6 deletions

diff --git a/src/partauto.c b/src/partauto.c
index d2b5adc0..792edae2 100644
--- a/src/partauto.c
+++ b/src/partauto.c
@@ -34,13 +34,25 @@
 #include "partauto.h"
 #include "log.h"
 
+extern const arch_fnct_t arch_none;
+#if !defined(SINGLE_PARTITION_TYPE) || defined(SINGLE_PARTITION_GPT)
 extern const arch_fnct_t arch_gpt;
+#endif
+#if !defined(SINGLE_PARTITION_TYPE) || defined(SINGLE_PARTITION_HUMAX)
 extern const arch_fnct_t arch_humax;
+#endif
+#if !defined(SINGLE_PARTITION_TYPE) || defined(SINGLE_PARTITION_I386)
 extern const arch_fnct_t arch_i386;
+#endif
+#if !defined(SINGLE_PARTITION_TYPE) || defined(SINGLE_PARTITION_MAC)
 extern const arch_fnct_t arch_mac;
-extern const arch_fnct_t arch_none;
+#endif
+#if !defined(SINGLE_PARTITION_TYPE) || defined(SINGLE_PARTITION_SUN)
 extern const arch_fnct_t arch_sun;
+#endif
+#if !defined(SINGLE_PARTITION_TYPE) || defined(SINGLE_PARTITION_XBOX)
 extern const arch_fnct_t arch_xbox;
+#endif
 
 void autodetect_arch(disk_t *disk, const arch_fnct_t *arch)
 {
@@ -55,42 +67,61 @@ void autodetect_arch(disk_t *disk, const arch_fnct_t *arch)
   {
     disk->arch=&arch_none;
     list_part=arch_none.read_part(disk,verbose,0);
+    /*@ assert valid_list_part(list_part); */
     if(list_part!=NULL && list_part->part!=NULL && list_part->part->upart_type==UP_UNK)
     {
       part_free_list(list_part);
       list_part=NULL;
     }
   }
+#if !defined(SINGLE_PARTITION_TYPE) || defined(SINGLE_PARTITION_XBOX)
   if(list_part==NULL)
   {
     disk->arch=&arch_xbox;
     list_part=arch_xbox.read_part(disk,verbose,0);
+    /*@ assert valid_list_part(list_part); */
   }
+#endif
+#if !defined(SINGLE_PARTITION_TYPE) || defined(SINGLE_PARTITION_GPT)
   if(list_part==NULL)
   {
     disk->arch=&arch_gpt;
     list_part=arch_gpt.read_part(disk,verbose,0);
+    /*@ assert valid_list_part(list_part); */
   }
+#endif
+#if !defined(SINGLE_PARTITION_TYPE) || defined(SINGLE_PARTITION_HUMAX)
   if(list_part==NULL)
   {
     disk->arch=&arch_humax;
     list_part=arch_humax.read_part(disk,verbose,0);
+    /*@ assert valid_list_part(list_part); */
   }
+#endif
+#if !defined(SINGLE_PARTITION_TYPE) || defined(SINGLE_PARTITION_I386)
   if(list_part==NULL)
   {
     disk->arch=&arch_i386;
     list_part=arch_i386.read_part(disk,verbose,0);
+    /*@ assert valid_list_part(list_part); */
   }
+#endif
+#if !defined(SINGLE_PARTITION_TYPE) || defined(SINGLE_PARTITION_SUN)
   if(list_part==NULL)
   {
     disk->arch=&arch_sun;
     list_part=arch_sun.read_part(disk,verbose,0);
+    /*@ assert valid_list_part(list_part); */
   }
+#endif
+#if !defined(SINGLE_PARTITION_TYPE) || defined(SINGLE_PARTITION_MAC)
   if(list_part==NULL)
   {
     disk->arch=&arch_mac;
     list_part=arch_mac.read_part(disk,verbose,0);
+    /*@ assert valid_list_part(list_part); */
   }
+#endif
 #ifndef DEBUG_PARTAUTO
   log_set_levels(old_levels);
 #endif
@@ -108,25 +139,29 @@ void autodetect_arch(disk_t *disk, const arch_fnct_t *arch)
   }
   else
   {
-#ifdef TARGET_SOLARIS
+#ifdef DISABLED_FOR_FRAMAC
+    disk->arch=&arch_none;
+#elif defined(TARGET_SOLARIS) && (!defined(SINGLE_PARTITION_TYPE) || defined(SINGLE_PARTITION_SUN))
     disk->arch=&arch_sun;
-#elif defined __APPLE__
-#ifdef TESTDISK_LSB
+#elif defined(__APPLE__) && defined(TESTDISK_LSB) && (!defined(SINGLE_PARTITION_TYPE) || defined(SINGLE_PARTITION_GPT))
     disk->arch=&arch_gpt;
-#else
+#elif defined(__APPLE__) && !defined(TESTDISK_LSB) && (!defined(SINGLE_PARTITION_TYPE) || defined(SINGLE_PARTITION_MAC))
     disk->arch=&arch_mac;
-#endif
 #else
 #if defined(__CYGWIN__) || defined(__MINGW32__)
     if(disk->device[0]=='\\' && disk->device[1]=='\\' && disk->device[2]=='.' && disk->device[3]=='\\' && disk->device[5]==':')
       disk->arch=&arch_none;
     else
 #endif
+#if !defined(SINGLE_PARTITION_TYPE) || (defined(SINGLE_PARTITION_I386) && defined(SINGLE_PARTITION_GPT))
     /* PC/Intel partition table is limited to 2 TB, 2^32 512-bytes sectors */
     if(disk->disk_size < ((uint64_t)1<<(32+9)))
       disk->arch=&arch_i386;
     else
       disk->arch=&arch_gpt;
+#else
+    disk->arch=&arch_none;
+#endif
 #endif
   }
   log_info("Partition table type defaults to %s\n", disk->arch->part_name);