Merge tag 'upstream/1.2.4'

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

diff --git a/mkfs/cbm.c b/mkfs/cbm.c
index 1a79a6b8a494d14d7b9f53cd88a73b46c1ae55f1..57e57845f541d21f2e3598098dc1b8d6204bf134 100644 (file)
--- a/mkfs/cbm.c
+++ b/mkfs/cbm.c
@@ -2,11 +2,12 @@
        cbm.c (09.11.10)
        Clusters Bitmap creation code.
 
-       Copyright (C) 2009, 2010  Andrew Nayenko
+       Free exFAT implementation.
+       Copyright (C) 2011-2016  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,52 +15,65 @@
        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 <unistd.h>
-#include <limits.h>
-#include <inttypes.h>
-#include <errno.h>
-#include "mkexfat.h"
+#include "cbm.h"
+#include "fat.h"
 #include "uct.h"
 #include "rootdir.h"
+#include <limits.h>
+#include <string.h>
 
-off_t cbm_alignment(void)
+static off_t cbm_alignment(void)
 {
-       return CLUSTER_SIZE(sb);
+       return get_cluster_size();
 }
 
-off_t cbm_size(void)
+static off_t cbm_size(void)
 {
-       return DIV_ROUND_UP(le32_to_cpu(sb.cluster_count), CHAR_BIT);
+       return DIV_ROUND_UP(
+                       (get_volume_size() - get_position(&cbm)) / get_cluster_size(),
+                       CHAR_BIT);
 }
 
-int cbm_write(struct exfat_dev* dev, off_t base)
+static int cbm_write(struct exfat_dev* dev)
 {
        uint32_t allocated_clusters =
-                       DIV_ROUND_UP(cbm_size(), CLUSTER_SIZE(sb)) +
-                       DIV_ROUND_UP(uct_size(), CLUSTER_SIZE(sb)) +
-                       DIV_ROUND_UP(rootdir_size(), CLUSTER_SIZE(sb));
-       size_t bitmap_size = DIV_ROUND_UP(allocated_clusters, CHAR_BIT);
-       uint8_t* bitmap = malloc(bitmap_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 = ROUND_UP(allocated_clusters, CHAR_BIT);
+       bitmap_t* bitmap = malloc(BMAP_SIZE(bitmap_size));
        size_t i;
 
        if (bitmap == NULL)
-               return errno;
+       {
+               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)
-               return errno;
+       if (exfat_write(dev, bitmap, bitmap_size / CHAR_BIT) < 0)
+       {
+               free(bitmap);
+               exfat_error("failed to write bitmap of %zu bytes",
+                               bitmap_size / CHAR_BIT);
+               return 1;
+       }
        free(bitmap);
-
-       sb.cluster_sector_start = cpu_to_le32(base / SECTOR_SIZE(sb));
-       bitmap_entry.start_cluster = cpu_to_le32(OFFSET_TO_CLUSTER(base));
-       bitmap_entry.size = cpu_to_le64(cbm_size());
        return 0;
 }
+
+const struct fs_object cbm =
+{
+       .get_alignment = cbm_alignment,
+       .get_size = cbm_size,
+       .write = cbm_write,
+};