volume_id: fat - move check for msdos signature (0x55 0xaa)

[elogind.git] / extras / volume_id / lib / fat.c

diff --git a/extras/volume_id/lib/fat.c b/extras/volume_id/lib/fat.c
index 62ff6b664f6fccfe3d554b60ce4b6e1a76726e78..e30318cf0967477e5931c58efd7dee6252fce42c 100644 (file)
--- a/extras/volume_id/lib/fat.c
+++ b/extras/volume_id/lib/fat.c
@@ -275,16 +275,12 @@ int volume_id_probe_vfat(struct volume_id *id, uint64_t off, uint64_t size)
        int maxloop;
        size_t fnlen;
 
-       info("probing at offset 0x%llx\n", (unsigned long long) off);
+       info("probing at offset 0x%" PRIx64 "\n", off);
 
        buf = volume_id_get_buffer(id, off, 0x400);
        if (buf == NULL)
                return -1;
 
-       /* check signature */
-       if (buf[510] != 0x55 || buf[511] != 0xaa)
-               return -1;
-
        vs = (struct vfat_super_block *) buf;
        if (memcmp(vs->sysid, "NTFS", 4) == 0)
                return -1;
@@ -305,12 +301,17 @@ int volume_id_probe_vfat(struct volume_id *id, uint64_t off, uint64_t size)
        if (memcmp(vs->type.fat.magic, "FAT12   ", 8) == 0)
                goto magic;
 
+       /* check signature */
+       if (buf[510] != 0x55 || buf[511] != 0xaa)
+               return -1;
+
        /* some old floppies don't have a magic, expect the boot jump address to match */
        if ((vs->boot_jump[0] != 0xeb || vs->boot_jump[2] != 0x90) &&
             vs->boot_jump[0] != 0xe9)
                return -1;
 
 magic:
+       info("magic found\n");
        /* reserverd sector count */
        if (!vs->reserved)
                return -1;
@@ -333,6 +334,7 @@ magic:
        if (sector_size == 0 || ((sector_size & (sector_size-1)) != 0))
                return -1;
 
+       info("checks passed\n");
        dbg("sector_size 0x%x\n", sector_size);
        dbg("sectors_per_cluster 0x%x\n", vs->sectors_per_cluster);
 
@@ -346,9 +348,9 @@ magic:
        dbg("sect_count 0x%x\n", sect_count);
 
        fat_length = le16_to_cpu(vs->fat_length);
-       dbg("fat_length 0x%x\n", fat_length);
+       info("fat_length 0x%x\n", fat_length);
        fat32_length = le32_to_cpu(vs->type.fat32.fat32_length);
-       dbg("fat32_length 0x%x\n", fat32_length);
+       info("fat32_length 0x%x\n", fat32_length);
 
        if (fat_length)
                fat_size = fat_length * vs->fats;
@@ -356,15 +358,15 @@ magic:
                fat_size = fat32_length * vs->fats;
        else
                return -1;
-       dbg("fat_size 0x%x\n", fat_size);
+       info("fat_size 0x%x\n", fat_size);
 
        dir_size = ((dir_entries * sizeof(struct vfat_dir_entry)) +
                        (sector_size-1)) / sector_size;
-       dbg("dir_size 0x%x\n", dir_size);
+       info("dir_size 0x%x\n", dir_size);
 
        cluster_count = sect_count - (reserved + fat_size + dir_size);
        cluster_count /= vs->sectors_per_cluster;
-       dbg("cluster_count 0x%x\n", cluster_count);
+       info("cluster_count 0x%x\n", cluster_count);
 
        /* must be FAT32 */
        if (!fat_length && fat32_length)
@@ -380,7 +382,7 @@ magic:
 
        /* the label may be an attribute in the root directory */
        root_start = (reserved + fat_size) * sector_size;
-       dbg("root dir start 0x%llx\n", (unsigned long long) root_start);
+       dbg("root dir start 0x%" PRIx64 "\n", root_start);
        root_dir_entries = le16_to_cpu(vs->dir_entries);
        dbg("expected entries 0x%x\n", root_dir_entries);
 
@@ -408,16 +410,24 @@ magic:
        goto found;
 
 fat32:
+       info("looking for FAT32\n");
        /* FAT32 should have a valid signature in the fsinfo block */
        fsinfo_sect = le16_to_cpu(vs->type.fat32.fsinfo_sector);
        buf = volume_id_get_buffer(id, off + (fsinfo_sect * sector_size), 0x200);
        if (buf == NULL)
                return -1;
        fsinfo = (struct fat32_fsinfo *) buf;
+       info("signature1: 0x%02x%02x%02x%02x\n",
+            fsinfo->signature1[0], fsinfo->signature1[1],
+            fsinfo->signature1[2], fsinfo->signature1[3]);
+       info("signature2: 0x%02x%02x%02x%02x\n",
+            fsinfo->signature2[0], fsinfo->signature2[1],
+            fsinfo->signature2[2], fsinfo->signature2[3]);
        if (memcmp(fsinfo->signature1, "\x52\x52\x61\x41", 4) != 0)
                return -1;
        if (memcmp(fsinfo->signature2, "\x72\x72\x41\x61", 4) != 0)
                return -1 ;
+       info("FAT32 signatures match\n");
 
        vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, 0x200);
        if (vs == NULL)
@@ -442,7 +452,7 @@ fat32:
                dbg("next cluster %u\n", next);
                next_sect_off = (next - 2) * vs->sectors_per_cluster;
                next_off = (start_data_sect + next_sect_off) * sector_size;
-               dbg("cluster offset 0x%llx\n", (unsigned long long) next_off);
+               dbg("cluster offset 0x%" PRIx64 "\n", next_off);
 
                /* get cluster */
                buf = volume_id_get_buffer(id, off + next_off, buf_size);