releasing package exfat-utils version 1.3.0-2

[sven/exfat-utils.git] / mkfs / cbm.c

diff --git a/mkfs/cbm.c b/mkfs/cbm.c
index c631d8a0d66edb7480a439f4010626a78a9999ec..ad5accc2a89ba99d67b3285cea659673feb675b3 100644 (file)
--- a/mkfs/cbm.c
+++ b/mkfs/cbm.c
@@ -2,11 +2,12 @@
        cbm.c (09.11.10)
        Clusters Bitmap creation code.
 
        cbm.c (09.11.10)
        Clusters Bitmap creation code.
 

-       Copyright (C) 2011-2013  Andrew Nayenko
+       Free exFAT implementation.
+       Copyright (C) 2011-2018  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
        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,
        (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.
 
        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 <http://www.gnu.org/licenses/>.
+       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 <limits.h>

 #include "cbm.h"
 #include "fat.h"
 #include "uct.h"
 #include "rootdir.h"
 #include "cbm.h"
 #include "fat.h"
 #include "uct.h"
 #include "rootdir.h"

+#include <limits.h>
+#include <string.h>

 
 static off_t cbm_alignment(void)
 {
 
 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());
                        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)
        {
        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;
        }
                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);
                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);
                return 1;
        }
        free(bitmap);