diff options
Diffstat (limited to 'exfat/mkfs/cbm.c')
| -rw-r--r-- | exfat/mkfs/cbm.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/exfat/mkfs/cbm.c b/exfat/mkfs/cbm.c index 0110b4065..025057132 100644 --- a/exfat/mkfs/cbm.c +++ b/exfat/mkfs/cbm.c @@ -3,7 +3,7 @@ Clusters Bitmap creation code. Free exFAT implementation. - Copyright (C) 2011-2013 Andrew Nayenko + Copyright (C) 2011-2015 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 @@ -20,18 +20,19 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include <limits.h> #include "cbm.h" #include "fat.h" #include "uct.h" #include "rootdir.h" +#include <limits.h> +#include <string.h> -static off64_t cbm_alignment(void) +static off_t cbm_alignment(void) { return get_cluster_size(); } -static off64_t cbm_size(void) +static off_t cbm_size(void) { return DIV_ROUND_UP( (get_volume_size() - get_position(&cbm)) / get_cluster_size(), @@ -44,24 +45,26 @@ static int cbm_write(struct exfat_dev* dev) DIV_ROUND_UP(cbm.get_size(), get_cluster_size()) + DIV_ROUND_UP(uct.get_size(), get_cluster_size()) + DIV_ROUND_UP(rootdir.get_size(), get_cluster_size()); - size_t bitmap_size = DIV_ROUND_UP(allocated_clusters, CHAR_BIT); - uint8_t* bitmap = malloc(bitmap_size); + size_t bitmap_size = ROUND_UP(allocated_clusters, CHAR_BIT); + bitmap_t* bitmap = malloc(BMAP_SIZE(bitmap_size)); size_t i; if (bitmap == NULL) { - exfat_error("failed to allocate bitmap of %zu bytes", bitmap_size); + exfat_error("failed to allocate bitmap of %zu bytes", + BMAP_SIZE(bitmap_size)); return 1; } + memset(bitmap, 0, BMAP_SIZE(bitmap_size)); - for (i = 0; i < bitmap_size * CHAR_BIT; i++) + for (i = 0; i < bitmap_size; i++) if (i < allocated_clusters) BMAP_SET(bitmap, i); - else - BMAP_CLR(bitmap, i); - if (exfat_write(dev, bitmap, bitmap_size) < 0) + if (exfat_write(dev, bitmap, bitmap_size / CHAR_BIT) < 0) { - exfat_error("failed to write bitmap of %zu bytes", bitmap_size); + free(bitmap); + exfat_error("failed to write bitmap of %zu bytes", + bitmap_size / CHAR_BIT); return 1; } free(bitmap); |