Big cleanup in config help and description

[oweals/busybox.git] / util-linux / volume_id / fat.c

diff --git a/util-linux/volume_id/fat.c b/util-linux/volume_id/fat.c
index 816d69d4c6e909d6490deb09c74b1d9b2fedb473..bc3433daf92818f8018ed3c5cbb082a2d8bcee40 100644 (file)
--- a/util-linux/volume_id/fat.c
+++ b/util-linux/volume_id/fat.c
@@ -18,6 +18,13 @@
  *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o
+
+//config:config FEATURE_VOLUMEID_FAT
+//config:      bool "fat filesystem"
+//config:      default y
+//config:      depends on VOLUMEID
+
 #include "volume_id_internal.h"
 
 /* linux/msdos_fs.h says: */
@@ -54,7 +61,7 @@ struct vfat_super_block {
                        uint8_t         magic[8];
                        uint8_t         dummy2[192];
                        uint8_t         pmagic[2];
-               } __attribute__((__packed__)) fat;
+               } PACKED fat;
                struct fat32_super_block {
                        uint32_t        fat32_length;
                        uint16_t        flags;
@@ -69,9 +76,9 @@ struct vfat_super_block {
                        uint8_t         magic[8];
                        uint8_t         dummy2[164];
                        uint8_t         pmagic[2];
-               } __attribute__((__packed__)) fat32;
-       } __attribute__((__packed__)) type;
-} __attribute__((__packed__));
+               } PACKED fat32;
+       } PACKED type;
+} PACKED;
 
 struct vfat_dir_entry {
        uint8_t         name[11];
@@ -85,7 +92,7 @@ struct vfat_dir_entry {
        uint16_t        date_write;
        uint16_t        cluster_low;
        uint32_t        size;
-} __attribute__((__packed__));
+} PACKED;
 
 static uint8_t *get_attr_volume_id(struct vfat_dir_entry *dir, int count)
 {
@@ -119,8 +126,9 @@ static uint8_t *get_attr_volume_id(struct vfat_dir_entry *dir, int count)
        return NULL;
 }
 
-int volume_id_probe_vfat(struct volume_id *id, uint64_t fat_partition_off)
+int FAST_FUNC volume_id_probe_vfat(struct volume_id *id /*,uint64_t fat_partition_off*/)
 {
+#define fat_partition_off ((uint64_t)0)
        struct vfat_super_block *vs;
        struct vfat_dir_entry *dir;
        uint16_t sector_size_bytes;
@@ -172,18 +180,22 @@ int volume_id_probe_vfat(struct volume_id *id, uint64_t fat_partition_off)
         */
 
        /* boot jump address check */
-       if ((vs->boot_jump[0] != 0xeb || vs->boot_jump[2] != 0x90) &&
-            vs->boot_jump[0] != 0xe9)
+       if ((vs->boot_jump[0] != 0xeb || vs->boot_jump[2] != 0x90)
+        && vs->boot_jump[0] != 0xe9
+       ) {
                return -1;
+       }
 
        /* heads check */
        if (vs->heads == 0)
                return -1;
 
        /* cluster size check */
-       if (vs->sectors_per_cluster == 0 ||
-           (vs->sectors_per_cluster & (vs->sectors_per_cluster-1)))
+       if (vs->sectors_per_cluster == 0
+        || (vs->sectors_per_cluster & (vs->sectors_per_cluster-1))
+       ) {
                return -1;
+       }
 
        /* media check */
        if (vs->media < 0xf8 && vs->media != 0xf0)
@@ -196,9 +208,11 @@ int volume_id_probe_vfat(struct volume_id *id, uint64_t fat_partition_off)
  valid:
        /* sector size check */
        sector_size_bytes = le16_to_cpu(vs->sector_size_bytes);
-       if (sector_size_bytes != 0x200 && sector_size_bytes != 0x400 &&
-           sector_size_bytes != 0x800 && sector_size_bytes != 0x1000)
+       if (sector_size_bytes != 0x200 && sector_size_bytes != 0x400
+        && sector_size_bytes != 0x800 && sector_size_bytes != 0x1000
+       ) {
                return -1;
+       }
 
        dbg("sector_size_bytes 0x%x", sector_size_bytes);
        dbg("sectors_per_cluster 0x%x", vs->sectors_per_cluster);
@@ -245,7 +259,7 @@ int volume_id_probe_vfat(struct volume_id *id, uint64_t fat_partition_off)
        buf_size = dir_entries * sizeof(struct vfat_dir_entry);
        buf = volume_id_get_buffer(id, fat_partition_off + root_start_off, buf_size);
        if (buf == NULL)
-               goto found;
+               goto ret;
 
        label = get_attr_volume_id((struct vfat_dir_entry*) buf, dir_entries);
 
@@ -261,7 +275,7 @@ int volume_id_probe_vfat(struct volume_id *id, uint64_t fat_partition_off)
                volume_id_set_label_string(id, vs->type.fat.label, 11);
        }
        volume_id_set_uuid(id, vs->type.fat.serno, UUID_DOS);
-       goto found;
+       goto ret;
 
  fat32:
        /* FAT32 root dir is a cluster chain like any other directory */
@@ -272,20 +286,20 @@ int volume_id_probe_vfat(struct volume_id *id, uint64_t fat_partition_off)
        next_cluster = root_cluster;
        maxloop = 100;
        while (--maxloop) {
-               uint32_t next_off_sct;
+               uint64_t next_off_sct;
                uint64_t next_off;
                uint64_t fat_entry_off;
                int count;
 
                dbg("next_cluster 0x%x", (unsigned)next_cluster);
-               next_off_sct = (next_cluster - 2) * vs->sectors_per_cluster;
+               next_off_sct = (uint64_t)(next_cluster - 2) * vs->sectors_per_cluster;
                next_off = (start_data_sct + next_off_sct) * sector_size_bytes;
                dbg("cluster offset 0x%llx", (unsigned long long) next_off);
 
                /* get cluster */
                buf = volume_id_get_buffer(id, fat_partition_off + next_off, buf_size);
                if (buf == NULL)
-                       goto found;
+                       goto ret;
 
                dir = (struct vfat_dir_entry*) buf;
                count = buf_size / sizeof(struct vfat_dir_entry);
@@ -300,7 +314,7 @@ int volume_id_probe_vfat(struct volume_id *id, uint64_t fat_partition_off)
                dbg("fat_entry_off 0x%llx", (unsigned long long)fat_entry_off);
                buf = volume_id_get_buffer(id, fat_partition_off + fat_entry_off, buf_size);
                if (buf == NULL)
-                       goto found;
+                       goto ret;
 
                /* set next cluster */
                next_cluster = le32_to_cpu(*(uint32_t*)buf) & 0x0fffffff;
@@ -323,9 +337,9 @@ int volume_id_probe_vfat(struct volume_id *id, uint64_t fat_partition_off)
        }
        volume_id_set_uuid(id, vs->type.fat32.serno, UUID_DOS);
 
- found:
+ ret:
 //     volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//     id->type = "vfat";
+       IF_FEATURE_BLKID_TYPE(id->type = "vfat";)
 
        return 0;
 }