main.c (08.11.10)
Prints detailed information about exFAT volume.
- Copyright (C) 2010 Andrew Nayenko
+ Copyright (C) 2011, 2012 Andrew Nayenko
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
printf("FS version %hhu.%hhu\n",
sb->version.major, sb->version.minor);
printf("Sector size %10u\n",
- BLOCK_SIZE(*sb));
+ SECTOR_SIZE(*sb));
printf("Cluster size %10u\n",
CLUSTER_SIZE(*sb));
}
-static void print_block_info(const struct exfat_super_block* sb)
+static void print_sector_info(const struct exfat_super_block* sb)
{
printf("Sectors count %10"PRIu64"\n",
- le64_to_cpu(sb->block_count));
+ le64_to_cpu(sb->sector_count));
}
static void print_cluster_info(const struct exfat_super_block* sb)
static void print_other_info(const struct exfat_super_block* sb)
{
printf("First sector %10"PRIu64"\n",
- le64_to_cpu(sb->block_start));
+ le64_to_cpu(sb->sector_start));
printf("FAT first sector %10u\n",
- le32_to_cpu(sb->fat_block_start));
+ le32_to_cpu(sb->fat_sector_start));
printf("FAT sectors count %10u\n",
- le32_to_cpu(sb->fat_block_count));
+ le32_to_cpu(sb->fat_sector_count));
printf("First cluster sector %10u\n",
- le32_to_cpu(sb->cluster_block_start));
+ le32_to_cpu(sb->cluster_sector_start));
printf("Root directory cluster %10u\n",
le32_to_cpu(sb->rootdir_cluster));
printf("Volume state 0x%04hx\n",
static int dump_sb(const char* spec)
{
- int fd;
+ struct exfat_dev* dev;
struct exfat_super_block sb;
- fd = open(spec, O_RDONLY);
- if (fd < 0)
- {
- exfat_error("failed to open `%s'", spec);
+ dev = exfat_open(spec, EXFAT_MODE_RO);
+ if (dev == NULL)
return 1;
- }
- if (read(fd, &sb, sizeof(struct exfat_super_block))
- != sizeof(struct exfat_super_block))
+
+ if (exfat_read(dev, &sb, sizeof(struct exfat_super_block)) < 0)
{
- close(fd);
+ exfat_close(dev);
exfat_error("failed to read from `%s'", spec);
return 1;
}
if (memcmp(sb.oem_name, "EXFAT ", sizeof(sb.oem_name)) != 0)
{
- close(fd);
+ exfat_close(dev);
exfat_error("exFAT file system is not found on `%s'", spec);
return 1;
}
print_generic_info(&sb);
- print_block_info(&sb);
+ print_sector_info(&sb);
print_cluster_info(&sb);
print_other_info(&sb);
- close(fd);
+ exfat_close(dev);
return 0;
}
off_t a = 0, b = 0;
printf("Used sectors ");
- while (exfat_find_used_blocks(ef, &a, &b) == 0)
+ while (exfat_find_used_sectors(ef, &a, &b) == 0)
printf(" %"PRIu64"-%"PRIu64, a, b);
puts("");
}
-static int dump_full(const char* spec, int used_sectors)
+static int dump_full(const char* spec, bool used_sectors)
{
struct exfat ef;
uint32_t free_clusters;
- uint64_t free_blocks;
+ uint64_t free_sectors;
if (exfat_mount(&ef, spec, "ro") != 0)
return 1;
free_clusters = exfat_count_free_clusters(&ef);
- free_blocks = (uint64_t) free_clusters << ef.sb->bpc_bits;
+ free_sectors = (uint64_t) free_clusters << ef.sb->spc_bits;
printf("Volume label %15s\n", exfat_get_label(&ef));
print_generic_info(ef.sb);
- print_block_info(ef.sb);
- printf("Free sectors %10"PRIu64"\n", free_blocks);
+ print_sector_info(ef.sb);
+ printf("Free sectors %10"PRIu64"\n", free_sectors);
print_cluster_info(ef.sb);
printf("Free clusters %10u\n", free_clusters);
print_other_info(ef.sb);
static void usage(const char* prog)
{
- fprintf(stderr, "Usage: %s [-s] [-u] <device>\n", prog);
+ fprintf(stderr, "Usage: %s [-s] [-u] [-v] <device>\n", prog);
exit(1);
}
{
char** pp;
const char* spec = NULL;
- int sb_only = 0;
- int used_sectors = 0;
+ bool sb_only = false;
+ bool used_sectors = false;
+
+ printf("dumpexfat %u.%u.%u\n",
+ EXFAT_VERSION_MAJOR, EXFAT_VERSION_MINOR, EXFAT_VERSION_PATCH);
for (pp = argv + 1; *pp; pp++)
{
if (strcmp(*pp, "-s") == 0)
- sb_only = 1;
+ sb_only = true;
else if (strcmp(*pp, "-u") == 0)
- used_sectors = 1;
+ used_sectors = true;
+ else if (strcmp(*pp, "-v") == 0)
+ {
+ puts("Copyright (C) 2011, 2012 Andrew Nayenko");
+ return 0;
+ }
else if (spec == NULL)
spec = *pp;
else