X-Git-Url: http://git.sven.stormbind.net/?a=blobdiff_plain;ds=inline;f=mkfs%2Fcbm.c;h=025057132912c727be12071441fc570ee2413724;hb=ba8bdbd4864a49fc1d38f7afa05d781ce260ab20;hp=1651160031178ead7393bb44440f131dd42308c1;hpb=4c15e072cf41b39ffa0c4354c64856a9c8414edf;p=sven%2Fexfat-utils.git
diff --git a/mkfs/cbm.c b/mkfs/cbm.c
index 1651160..0250571 100644
--- a/mkfs/cbm.c
+++ b/mkfs/cbm.c
@@ -2,11 +2,12 @@
cbm.c (09.11.10)
Clusters Bitmap creation code.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Free exFAT implementation.
+ Copyright (C) 2011-2015 Andrew Nayenko
- This program is free software: you can redistribute it and/or modify
+ 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
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -14,15 +15,17 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include
#include "cbm.h"
#include "fat.h"
#include "uct.h"
#include "rootdir.h"
+#include
+#include
static off_t cbm_alignment(void)
{
@@ -42,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);