summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--exfat/ChangeLog27
-rw-r--r--exfat/cluster.c428
-rw-r--r--exfat/dump/main.c4
-rw-r--r--exfat/exfat-fuse/main.c4
-rw-r--r--exfat/fsck/main.c4
-rw-r--r--exfat/label/main.c4
-rw-r--r--exfat/libexfat/byteorder.h2
-rw-r--r--exfat/libexfat/cluster.c2
-rw-r--r--exfat/libexfat/exfat.h2
-rw-r--r--exfat/libexfat/exfatfs.h2
-rw-r--r--exfat/libexfat/log.c2
-rw-r--r--exfat/libexfat/lookup.c2
-rw-r--r--exfat/libexfat/mount.c2
-rw-r--r--exfat/libexfat/node.c21
-rw-r--r--exfat/libexfat/time.c2
-rw-r--r--exfat/libexfat/utf.c2
-rw-r--r--exfat/libexfat/utils.c2
-rw-r--r--exfat/libexfat/version.h8
-rw-r--r--exfat/mkfs/cbm.c2
-rw-r--r--exfat/mkfs/cbm.h2
-rw-r--r--exfat/mkfs/fat.c2
-rw-r--r--exfat/mkfs/fat.h2
-rw-r--r--exfat/mkfs/main.c4
-rw-r--r--exfat/mkfs/mkexfat.c2
-rw-r--r--exfat/mkfs/mkexfat.h2
-rw-r--r--exfat/mkfs/rootdir.c2
-rw-r--r--exfat/mkfs/rootdir.h2
-rw-r--r--exfat/mkfs/uct.c2
-rw-r--r--exfat/mkfs/uct.h2
-rw-r--r--exfat/mkfs/uctc.c2
-rw-r--r--exfat/mkfs/uctc.h2
-rw-r--r--exfat/mkfs/vbr.c2
-rw-r--r--exfat/mkfs/vbr.h2
-rw-r--r--exfat/node.c1038
34 files changed, 84 insertions, 1506 deletions
diff --git a/exfat/ChangeLog b/exfat/ChangeLog
index e42a095e0..e24b2d60b 100644
--- a/exfat/ChangeLog
+++ b/exfat/ChangeLog
@@ -1,3 +1,30 @@
+1.0.0 (2013-01-19)
+
+* Fixed crash when renaming a file within a single directory and a new name
+differs only in case.
+* Fixed clusters allocation: a cluster beyond valid clusters range could be
+allocated.
+* Fixed crash when a volume is unmounted while some files are open.
+* SConscript now respects AR and RANLIB environment variables.
+* Improved error handling.
+
+Linux:
+
+* Enabled big_writes. This improves write speed (larger block size means less
+switches between kernel- and user-space).
+* Do BLKROGET ioctl to make sure the device is not read-only: after
+"blockdev --setro" kernel still allows to open the device in read-write mode
+but fails writes.
+
+OS X:
+
+* Fixed OS X 10.8 support.
+* Switched to 64-bit inode numbers (now Mac OS X 10.5 or later is required).
+* Switched from unmaintained MacFUSE to OSXFUSE (http://osxfuse.github.com).
+* Fixed device size detection. Now mkfs works.
+* Workarounded some utilities failures due to missing chmod() support.
+* Disabled (senseless) permission checks made by FUSE.
+
0.9.8 (2012-08-09)
* The mkfs utility can now create huge file systems (up to several exabytes).
diff --git a/exfat/cluster.c b/exfat/cluster.c
deleted file mode 100644
index 6b0303df8..000000000
--- a/exfat/cluster.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
- cluster.c (03.09.09)
- exFAT file system implementation library.
-
- Copyright (C) 2010-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
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- 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/>.
-*/
-
-#include "exfat.h"
-#include <errno.h>
-#include <string.h>
-
-/*
- * Sector to absolute offset.
- */
-static off64_t s2o(const struct exfat* ef, off64_t sector)
-{
- return sector << ef->sb->sector_bits;
-}
-
-/*
- * Cluster to sector.
- */
-static off64_t c2s(const struct exfat* ef, cluster_t cluster)
-{
- if (cluster < EXFAT_FIRST_DATA_CLUSTER)
- exfat_bug("invalid cluster number %u", cluster);
- return le32_to_cpu(ef->sb->cluster_sector_start) +
- ((off64_t) (cluster - EXFAT_FIRST_DATA_CLUSTER) << ef->sb->spc_bits);
-}
-
-/*
- * Cluster to absolute offset.
- */
-off64_t exfat_c2o(const struct exfat* ef, cluster_t cluster)
-{
- return s2o(ef, c2s(ef, cluster));
-}
-
-/*
- * Sector to cluster.
- */
-static cluster_t s2c(const struct exfat* ef, off64_t sector)
-{
- return ((sector - le32_to_cpu(ef->sb->cluster_sector_start)) >>
- ef->sb->spc_bits) + EXFAT_FIRST_DATA_CLUSTER;
-}
-
-/*
- * Size in bytes to size in clusters (rounded upwards).
- */
-static uint32_t bytes2clusters(const struct exfat* ef, uint64_t bytes)
-{
- uint64_t cluster_size = CLUSTER_SIZE(*ef->sb);
- return (bytes + cluster_size - 1) / cluster_size;
-}
-
-cluster_t exfat_next_cluster(const struct exfat* ef,
- const struct exfat_node* node, cluster_t cluster)
-{
- le32_t next;
- off64_t fat_offset;
-
- if (cluster < EXFAT_FIRST_DATA_CLUSTER)
- exfat_bug("bad cluster 0x%x", cluster);
-
- if (IS_CONTIGUOUS(*node))
- return cluster + 1;
- fat_offset = s2o(ef, le32_to_cpu(ef->sb->fat_sector_start))
- + cluster * sizeof(cluster_t);
- exfat_pread(ef->dev, &next, sizeof(next), fat_offset);
- return le32_to_cpu(next);
-}
-
-cluster_t exfat_advance_cluster(const struct exfat* ef,
- struct exfat_node* node, uint32_t count)
-{
- uint32_t i;
-
- if (node->fptr_index > count)
- {
- node->fptr_index = 0;
- node->fptr_cluster = node->start_cluster;
- }
-
- for (i = node->fptr_index; i < count; i++)
- {
- node->fptr_cluster = exfat_next_cluster(ef, node, node->fptr_cluster);
- if (CLUSTER_INVALID(node->fptr_cluster))
- break; /* the caller should handle this and print appropriate
- error message */
- }
- node->fptr_index = count;
- return node->fptr_cluster;
-}
-
-static cluster_t find_bit_and_set(uint8_t* bitmap, size_t start, size_t end)
-{
- const size_t start_index = start / 8;
- const size_t end_index = DIV_ROUND_UP(end, 8);
- size_t i;
- size_t c;
-
- for (i = start_index; i < end_index; i++)
- {
- if (bitmap[i] == 0xff)
- continue;
- for (c = MAX(i * 8, start); c < MIN((i + 1) * 8, end); c++)
- if (BMAP_GET(bitmap, c) == 0)
- {
- BMAP_SET(bitmap, c);
- return c + EXFAT_FIRST_DATA_CLUSTER;
- }
- }
- return EXFAT_CLUSTER_END;
-}
-
-void exfat_flush_cmap(struct exfat* ef)
-{
- exfat_pwrite(ef->dev, ef->cmap.chunk, (ef->cmap.chunk_size + 7) / 8,
- exfat_c2o(ef, ef->cmap.start_cluster));
- ef->cmap.dirty = false;
-}
-
-static void set_next_cluster(const struct exfat* ef, int contiguous,
- cluster_t current, cluster_t next)
-{
- off64_t fat_offset;
- le32_t next_le32;
-
- if (contiguous)
- return;
- fat_offset = s2o(ef, le32_to_cpu(ef->sb->fat_sector_start))
- + current * sizeof(cluster_t);
- next_le32 = cpu_to_le32(next);
- exfat_pwrite(ef->dev, &next_le32, sizeof(next_le32), fat_offset);
-}
-
-static cluster_t allocate_cluster(struct exfat* ef, cluster_t hint)
-{
- cluster_t cluster;
-
- hint -= EXFAT_FIRST_DATA_CLUSTER;
- if (hint >= ef->cmap.chunk_size)
- hint = 0;
-
- cluster = find_bit_and_set(ef->cmap.chunk, hint, ef->cmap.chunk_size);
- if (cluster == EXFAT_CLUSTER_END)
- cluster = find_bit_and_set(ef->cmap.chunk, 0, hint);
- if (cluster == EXFAT_CLUSTER_END)
- {
- exfat_error("no free space left");
- return EXFAT_CLUSTER_END;
- }
-
- ef->cmap.dirty = true;
- return cluster;
-}
-
-static void free_cluster(struct exfat* ef, cluster_t cluster)
-{
- if (CLUSTER_INVALID(cluster))
- exfat_bug("freeing invalid cluster 0x%x", cluster);
- if (cluster - EXFAT_FIRST_DATA_CLUSTER >= ef->cmap.size)
- exfat_bug("freeing non-existing cluster 0x%x (0x%x)", cluster,
- ef->cmap.size);
-
- BMAP_CLR(ef->cmap.chunk, cluster - EXFAT_FIRST_DATA_CLUSTER);
- ef->cmap.dirty = true;
-}
-
-static void make_noncontiguous(const struct exfat* ef, cluster_t first,
- cluster_t last)
-{
- cluster_t c;
-
- for (c = first; c < last; c++)
- set_next_cluster(ef, 0, c, c + 1);
-}
-
-static int shrink_file(struct exfat* ef, struct exfat_node* node,
- uint32_t current, uint32_t difference);
-
-static int grow_file(struct exfat* ef, struct exfat_node* node,
- uint32_t current, uint32_t difference)
-{
- cluster_t previous;
- cluster_t next;
- uint32_t allocated = 0;
-
- if (difference == 0)
- exfat_bug("zero clusters count passed");
-
- if (node->start_cluster != EXFAT_CLUSTER_FREE)
- {
- /* get the last cluster of the file */
- previous = exfat_advance_cluster(ef, node, current - 1);
- if (CLUSTER_INVALID(previous))
- {
- exfat_error("invalid cluster 0x%x while growing", previous);
- return -EIO;
- }
- }
- else
- {
- if (node->fptr_index != 0)
- exfat_bug("non-zero pointer index (%u)", node->fptr_index);
- /* file does not have clusters (i.e. is empty), allocate
- the first one for it */
- previous = allocate_cluster(ef, 0);
- if (CLUSTER_INVALID(previous))
- return -ENOSPC;
- node->fptr_cluster = node->start_cluster = previous;
- allocated = 1;
- /* file consists of only one cluster, so it's contiguous */
- node->flags |= EXFAT_ATTRIB_CONTIGUOUS;
- }
-
- while (allocated < difference)
- {
- next = allocate_cluster(ef, previous + 1);
- if (CLUSTER_INVALID(next))
- {
- if (allocated != 0)
- shrink_file(ef, node, current + allocated, allocated);
- return -ENOSPC;
- }
- if (next != previous - 1 && IS_CONTIGUOUS(*node))
- {
- /* it's a pity, but we are not able to keep the file contiguous
- anymore */
- make_noncontiguous(ef, node->start_cluster, previous);
- node->flags &= ~EXFAT_ATTRIB_CONTIGUOUS;
- node->flags |= EXFAT_ATTRIB_DIRTY;
- }
- set_next_cluster(ef, IS_CONTIGUOUS(*node), previous, next);
- previous = next;
- allocated++;
- }
-
- set_next_cluster(ef, IS_CONTIGUOUS(*node), previous, EXFAT_CLUSTER_END);
- return 0;
-}
-
-static int shrink_file(struct exfat* ef, struct exfat_node* node,
- uint32_t current, uint32_t difference)
-{
- cluster_t previous;
- cluster_t next;
-
- if (difference == 0)
- exfat_bug("zero difference passed");
- if (node->start_cluster == EXFAT_CLUSTER_FREE)
- exfat_bug("unable to shrink empty file (%u clusters)", current);
- if (current < difference)
- exfat_bug("file underflow (%u < %u)", current, difference);
-
- /* crop the file */
- if (current > difference)
- {
- cluster_t last = exfat_advance_cluster(ef, node,
- current - difference - 1);
- if (CLUSTER_INVALID(last))
- {
- exfat_error("invalid cluster 0x%x while shrinking", last);
- return -EIO;
- }
- previous = exfat_next_cluster(ef, node, last);
- set_next_cluster(ef, IS_CONTIGUOUS(*node), last, EXFAT_CLUSTER_END);
- }
- else
- {
- previous = node->start_cluster;
- node->start_cluster = EXFAT_CLUSTER_FREE;
- }
- node->fptr_index = 0;
- node->fptr_cluster = node->start_cluster;
-
- /* free remaining clusters */
- while (difference--)
- {
- if (CLUSTER_INVALID(previous))
- {
- exfat_error("invalid cluster 0x%x while freeing after shrink",
- previous);
- return -EIO;
- }
- next = exfat_next_cluster(ef, node, previous);
- set_next_cluster(ef, IS_CONTIGUOUS(*node), previous,
- EXFAT_CLUSTER_FREE);
- free_cluster(ef, previous);
- previous = next;
- }
- return 0;
-}
-
-static void erase_raw(struct exfat* ef, size_t size, off64_t offset)
-{
- exfat_pwrite(ef->dev, ef->zero_cluster, size, offset);
-}
-
-static int erase_range(struct exfat* ef, struct exfat_node* node,
- uint64_t begin, uint64_t end)
-{
- uint64_t cluster_boundary;
- cluster_t cluster;
-
- if (begin >= end)
- return 0;
-
- cluster_boundary = (begin | (CLUSTER_SIZE(*ef->sb) - 1)) + 1;
- cluster = exfat_advance_cluster(ef, node,
- begin / CLUSTER_SIZE(*ef->sb));
- if (CLUSTER_INVALID(cluster))
- {
- exfat_error("invalid cluster 0x%x while erasing", cluster);
- return -EIO;
- }
- /* erase from the beginning to the closest cluster boundary */
- erase_raw(ef, MIN(cluster_boundary, end) - begin,
- exfat_c2o(ef, cluster) + begin % CLUSTER_SIZE(*ef->sb));
- /* erase whole clusters */
- while (cluster_boundary < end)
- {
- cluster = exfat_next_cluster(ef, node, cluster);
- /* the cluster cannot be invalid because we have just allocated it */
- if (CLUSTER_INVALID(cluster))
- exfat_bug("invalid cluster 0x%x after allocation", cluster);
- erase_raw(ef, CLUSTER_SIZE(*ef->sb), exfat_c2o(ef, cluster));
- cluster_boundary += CLUSTER_SIZE(*ef->sb);
- }
- return 0;
-}
-
-int exfat_truncate(struct exfat* ef, struct exfat_node* node, uint64_t size)
-{
- uint32_t c1 = bytes2clusters(ef, node->size);
- uint32_t c2 = bytes2clusters(ef, size);
- int rc = 0;
-
- if (node->references == 0 && node->parent)
- exfat_bug("no references, node changes can be lost");
-
- if (node->size == size)
- return 0;
-
- if (c1 < c2)
- rc = grow_file(ef, node, c1, c2 - c1);
- else if (c1 > c2)
- rc = shrink_file(ef, node, c1, c1 - c2);
-
- if (rc != 0)
- return rc;
-
- rc = erase_range(ef, node, node->size, size);
- if (rc != 0)
- return rc;
-
- exfat_update_mtime(node);
- node->size = size;
- node->flags |= EXFAT_ATTRIB_DIRTY;
- return 0;
-}
-
-uint32_t exfat_count_free_clusters(const struct exfat* ef)
-{
- uint32_t free_clusters = 0;
- uint32_t i;
-
- for (i = 0; i < ef->cmap.size; i++)
- if (BMAP_GET(ef->cmap.chunk, i) == 0)
- free_clusters++;
- return free_clusters;
-}
-
-static int find_used_clusters(const struct exfat* ef,
- cluster_t* a, cluster_t* b)
-{
- const cluster_t end = le32_to_cpu(ef->sb->cluster_count);
-
- /* find first used cluster */
- for (*a = *b + 1; *a < end; (*a)++)
- if (BMAP_GET(ef->cmap.chunk, *a - EXFAT_FIRST_DATA_CLUSTER))
- break;
- if (*a >= end)
- return 1;
-
- /* find last contiguous used cluster */
- for (*b = *a; *b < end; (*b)++)
- if (BMAP_GET(ef->cmap.chunk, *b - EXFAT_FIRST_DATA_CLUSTER) == 0)
- {
- (*b)--;
- break;
- }
-
- return 0;
-}
-
-int exfat_find_used_sectors(const struct exfat* ef, off64_t* a, off64_t* b)
-{
- cluster_t ca, cb;
-
- if (*a == 0 && *b == 0)
- ca = cb = EXFAT_FIRST_DATA_CLUSTER - 1;
- else
- {
- ca = s2c(ef, *a);
- cb = s2c(ef, *b);
- }
- if (find_used_clusters(ef, &ca, &cb) != 0)
- return 1;
- if (*a != 0 || *b != 0)
- *a = c2s(ef, ca);
- *b = c2s(ef, cb) + (CLUSTER_SIZE(*ef->sb) - 1) / SECTOR_SIZE(*ef->sb);
- return 0;
-}
diff --git a/exfat/dump/main.c b/exfat/dump/main.c
index d7ea2a365..fa80903b8 100644
--- a/exfat/dump/main.c
+++ b/exfat/dump/main.c
@@ -2,7 +2,7 @@
main.c (08.11.10)
Prints detailed information about exFAT volume.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
@@ -162,7 +162,7 @@ int main(int argc, char* argv[])
used_sectors = true;
else if (strcmp(*pp, "-v") == 0)
{
- puts("Copyright (C) 2011, 2012 Andrew Nayenko");
+ puts("Copyright (C) 2011-2013 Andrew Nayenko");
return 0;
}
else if (spec == NULL)
diff --git a/exfat/exfat-fuse/main.c b/exfat/exfat-fuse/main.c
index e50c14a74..7f4ac1896 100644
--- a/exfat/exfat-fuse/main.c
+++ b/exfat/exfat-fuse/main.c
@@ -2,7 +2,7 @@
main.c (01.09.09)
FUSE-based exFAT implementation. Requires FUSE 2.6 or later.
- Copyright (C) 2010-2012 Andrew Nayenko
+ Copyright (C) 2010-2013 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
@@ -438,7 +438,7 @@ int main(int argc, char* argv[])
else if (strcmp(*pp, "-v") == 0)
{
free(mount_options);
- puts("Copyright (C) 2010-2012 Andrew Nayenko");
+ puts("Copyright (C) 2010-2013 Andrew Nayenko");
return 0;
}
else if (spec == NULL)
diff --git a/exfat/fsck/main.c b/exfat/fsck/main.c
index c90e3f94b..9eefd747d 100644
--- a/exfat/fsck/main.c
+++ b/exfat/fsck/main.c
@@ -2,7 +2,7 @@
main.c (02.09.09)
exFAT file system checker.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
@@ -141,7 +141,7 @@ int main(int argc, char* argv[])
{
if (strcmp(*pp, "-v") == 0)
{
- puts("Copyright (C) 2011, 2012 Andrew Nayenko");
+ puts("Copyright (C) 2011-2013 Andrew Nayenko");
return 0;
}
else if (spec == NULL)
diff --git a/exfat/label/main.c b/exfat/label/main.c
index b3a3d3036..8a429d58d 100644
--- a/exfat/label/main.c
+++ b/exfat/label/main.c
@@ -2,7 +2,7 @@
main.c (20.01.11)
Prints or changes exFAT volume label.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
@@ -33,7 +33,7 @@ int main(int argc, char* argv[])
{
printf("exfatlabel %u.%u.%u\n", EXFAT_VERSION_MAJOR,
EXFAT_VERSION_MINOR, EXFAT_VERSION_PATCH);
- puts("Copyright (C) 2011, 2012 Andrew Nayenko");
+ puts("Copyright (C) 2011-2013 Andrew Nayenko");
return 0;
}
diff --git a/exfat/libexfat/byteorder.h b/exfat/libexfat/byteorder.h
index 4850efb3d..6792f37c0 100644
--- a/exfat/libexfat/byteorder.h
+++ b/exfat/libexfat/byteorder.h
@@ -2,7 +2,7 @@
byteorder.h (12.01.10)
Endianness stuff. exFAT uses little-endian byte order.
- Copyright (C) 2010-2012 Andrew Nayenko
+ Copyright (C) 2010-2013 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
diff --git a/exfat/libexfat/cluster.c b/exfat/libexfat/cluster.c
index cb3e87165..83c983da4 100644
--- a/exfat/libexfat/cluster.c
+++ b/exfat/libexfat/cluster.c
@@ -2,7 +2,7 @@
cluster.c (03.09.09)
exFAT file system implementation library.
- Copyright (C) 2010-2012 Andrew Nayenko
+ Copyright (C) 2010-2013 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
diff --git a/exfat/libexfat/exfat.h b/exfat/libexfat/exfat.h
index 6f152670d..11be06f7b 100644
--- a/exfat/libexfat/exfat.h
+++ b/exfat/libexfat/exfat.h
@@ -3,7 +3,7 @@
Definitions of structures and constants used in exFAT file system
implementation.
- Copyright (C) 2010-2012 Andrew Nayenko
+ Copyright (C) 2010-2013 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
diff --git a/exfat/libexfat/exfatfs.h b/exfat/libexfat/exfatfs.h
index 5a8e39fda..6c58a842a 100644
--- a/exfat/libexfat/exfatfs.h
+++ b/exfat/libexfat/exfatfs.h
@@ -2,7 +2,7 @@
exfatfs.h (29.08.09)
Definitions of structures and constants used in exFAT file system.
- Copyright (C) 2010-2012 Andrew Nayenko
+ Copyright (C) 2010-2013 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
diff --git a/exfat/libexfat/log.c b/exfat/libexfat/log.c
index 8b589b406..034cc09f4 100644
--- a/exfat/libexfat/log.c
+++ b/exfat/libexfat/log.c
@@ -2,7 +2,7 @@
log.c (02.09.09)
exFAT file system implementation library.
- Copyright (C) 2010-2012 Andrew Nayenko
+ Copyright (C) 2010-2013 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
diff --git a/exfat/libexfat/lookup.c b/exfat/libexfat/lookup.c
index 8c889b2b2..2e1aa8184 100644
--- a/exfat/libexfat/lookup.c
+++ b/exfat/libexfat/lookup.c
@@ -2,7 +2,7 @@
lookup.c (02.09.09)
exFAT file system implementation library.
- Copyright (C) 2010-2012 Andrew Nayenko
+ Copyright (C) 2010-2013 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
diff --git a/exfat/libexfat/mount.c b/exfat/libexfat/mount.c
index 44fb58138..4daf12668 100644
--- a/exfat/libexfat/mount.c
+++ b/exfat/libexfat/mount.c
@@ -2,7 +2,7 @@
mount.c (22.10.09)
exFAT file system implementation library.
- Copyright (C) 2010-2012 Andrew Nayenko
+ Copyright (C) 2010-2013 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
diff --git a/exfat/libexfat/node.c b/exfat/libexfat/node.c
index bacb01d10..ff2cea9ab 100644
--- a/exfat/libexfat/node.c
+++ b/exfat/libexfat/node.c
@@ -2,7 +2,7 @@
node.c (09.10.09)
exFAT file system implementation library.
- Copyright (C) 2010-2012 Andrew Nayenko
+ Copyright (C) 2010-2013 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
@@ -486,7 +486,7 @@ void exfat_reset_cache(struct exfat* ef)
reset_cache(ef, ef->root);
}
-void next_entry(struct exfat* ef, const struct exfat_node* parent,
+static void next_entry(struct exfat* ef, const struct exfat_node* parent,
cluster_t* cluster, off64_t* offset)
{
*offset += sizeof(struct exfat_entry);
@@ -908,6 +908,23 @@ int exfat_rename(struct exfat* ef, const char* old_path, const char* new_path)
exfat_put_node(ef, node);
return rc;
}
+
+ /* check that target is not a subdirectory of the source */
+ if (node->flags & EXFAT_ATTRIB_DIR)
+ {
+ struct exfat_node* p;
+
+ for (p = dir; p; p = p->parent)
+ if (node == p)
+ {
+ if (existing != NULL)
+ exfat_put_node(ef, existing);
+ exfat_put_node(ef, dir);
+ exfat_put_node(ef, node);
+ return -EINVAL;
+ }
+ }
+
if (existing != NULL)
{
/* remove target if it's not the same node as source */
diff --git a/exfat/libexfat/time.c b/exfat/libexfat/time.c
index 890930eac..10a826a99 100644
--- a/exfat/libexfat/time.c
+++ b/exfat/libexfat/time.c
@@ -2,7 +2,7 @@
time.c (03.02.12)
exFAT file system implementation library.
- Copyright (C) 2010-2012 Andrew Nayenko
+ Copyright (C) 2010-2013 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
diff --git a/exfat/libexfat/utf.c b/exfat/libexfat/utf.c
index 983c7930b..fd16fe964 100644
--- a/exfat/libexfat/utf.c
+++ b/exfat/libexfat/utf.c
@@ -2,7 +2,7 @@
utf.c (13.09.09)
exFAT file system implementation library.
- Copyright (C) 2010-2012 Andrew Nayenko
+ Copyright (C) 2010-2013 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
diff --git a/exfat/libexfat/utils.c b/exfat/libexfat/utils.c
index 14b4791fe..499833b50 100644
--- a/exfat/libexfat/utils.c
+++ b/exfat/libexfat/utils.c
@@ -2,7 +2,7 @@
utils.c (04.09.09)
exFAT file system implementation library.
- Copyright (C) 2010-2012 Andrew Nayenko
+ Copyright (C) 2010-2013 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
diff --git a/exfat/libexfat/version.h b/exfat/libexfat/version.h
index f35cb4fdf..b795e9159 100644
--- a/exfat/libexfat/version.h
+++ b/exfat/libexfat/version.h
@@ -2,7 +2,7 @@
version.h (12.06.10)
Version constants.
- Copyright (C) 2010-2012 Andrew Nayenko
+ Copyright (C) 2010-2013 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
@@ -21,8 +21,8 @@
#ifndef VERSION_H_INCLUDED
#define VERSION_H_INCLUDED
-#define EXFAT_VERSION_MAJOR 0
-#define EXFAT_VERSION_MINOR 9
-#define EXFAT_VERSION_PATCH 8
+#define EXFAT_VERSION_MAJOR 1
+#define EXFAT_VERSION_MINOR 0
+#define EXFAT_VERSION_PATCH 0
#endif /* ifndef VERSION_H_INCLUDED */
diff --git a/exfat/mkfs/cbm.c b/exfat/mkfs/cbm.c
index 6d948b4cd..f255fb10a 100644
--- a/exfat/mkfs/cbm.c
+++ b/exfat/mkfs/cbm.c
@@ -2,7 +2,7 @@
cbm.c (09.11.10)
Clusters Bitmap creation code.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
diff --git a/exfat/mkfs/cbm.h b/exfat/mkfs/cbm.h
index 176504c0f..64883c730 100644
--- a/exfat/mkfs/cbm.h
+++ b/exfat/mkfs/cbm.h
@@ -2,7 +2,7 @@
cbm.h (09.11.10)
Clusters Bitmap creation code.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
diff --git a/exfat/mkfs/fat.c b/exfat/mkfs/fat.c
index 82feff8ba..158f59f6d 100644
--- a/exfat/mkfs/fat.c
+++ b/exfat/mkfs/fat.c
@@ -2,7 +2,7 @@
fat.c (09.11.10)
File Allocation Table creation code.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
diff --git a/exfat/mkfs/fat.h b/exfat/mkfs/fat.h
index 8d7b86c10..f7eb395cf 100644
--- a/exfat/mkfs/fat.h
+++ b/exfat/mkfs/fat.h
@@ -2,7 +2,7 @@
fat.h (09.11.10)
File Allocation Table creation code.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
diff --git a/exfat/mkfs/main.c b/exfat/mkfs/main.c
index 9feb750ee..97e465a5b 100644
--- a/exfat/mkfs/main.c
+++ b/exfat/mkfs/main.c
@@ -2,7 +2,7 @@
main.c (15.08.10)
Creates exFAT file system.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
@@ -242,7 +242,7 @@ int main(int argc, char* argv[])
}
else if (strcmp(*pp, "-v") == 0)
{
- puts("Copyright (C) 2011, 2012 Andrew Nayenko");
+ puts("Copyright (C) 2011-2013 Andrew Nayenko");
return 0;
}
else if (spec == NULL)
diff --git a/exfat/mkfs/mkexfat.c b/exfat/mkfs/mkexfat.c
index 7018aaae2..aeb48a26c 100644
--- a/exfat/mkfs/mkexfat.c
+++ b/exfat/mkfs/mkexfat.c
@@ -2,7 +2,7 @@
mkexfat.c (22.04.12)
FS creation engine.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
diff --git a/exfat/mkfs/mkexfat.h b/exfat/mkfs/mkexfat.h
index 4634d0d95..47a13b00b 100644
--- a/exfat/mkfs/mkexfat.h
+++ b/exfat/mkfs/mkexfat.h
@@ -2,7 +2,7 @@
mkexfat.h (09.11.10)
FS creation engine.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
diff --git a/exfat/mkfs/rootdir.c b/exfat/mkfs/rootdir.c
index ddc476f4c..4890e120f 100644
--- a/exfat/mkfs/rootdir.c
+++ b/exfat/mkfs/rootdir.c
@@ -2,7 +2,7 @@
rootdir.c (09.11.10)
Root directory creation code.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
diff --git a/exfat/mkfs/rootdir.h b/exfat/mkfs/rootdir.h
index 64e533243..f3e7843ac 100644
--- a/exfat/mkfs/rootdir.h
+++ b/exfat/mkfs/rootdir.h
@@ -2,7 +2,7 @@
rootdir.h (09.11.10)
Root directory creation code.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
diff --git a/exfat/mkfs/uct.c b/exfat/mkfs/uct.c
index e6fd2c02e..1d22b095d 100644
--- a/exfat/mkfs/uct.c
+++ b/exfat/mkfs/uct.c
@@ -2,7 +2,7 @@
uct.c (09.11.10)
Upper Case Table creation code.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
diff --git a/exfat/mkfs/uct.h b/exfat/mkfs/uct.h
index 4b4f024cb..f726debb1 100644
--- a/exfat/mkfs/uct.h
+++ b/exfat/mkfs/uct.h
@@ -2,7 +2,7 @@
uct.h (09.11.10)
Upper Case Table creation code.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
diff --git a/exfat/mkfs/uctc.c b/exfat/mkfs/uctc.c
index 573981168..b4358d999 100644
--- a/exfat/mkfs/uctc.c
+++ b/exfat/mkfs/uctc.c
@@ -2,7 +2,7 @@
uctc.c (30.04.12)
Upper Case Table contents.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
diff --git a/exfat/mkfs/uctc.h b/exfat/mkfs/uctc.h
index 67d2bba6b..499a60ed1 100644
--- a/exfat/mkfs/uctc.h
+++ b/exfat/mkfs/uctc.h
@@ -2,7 +2,7 @@
uctc.h (30.10.10)
Upper Case Table declaration.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
diff --git a/exfat/mkfs/vbr.c b/exfat/mkfs/vbr.c
index 80e7a61e6..935c96bee 100644
--- a/exfat/mkfs/vbr.c
+++ b/exfat/mkfs/vbr.c
@@ -2,7 +2,7 @@
vbr.c (09.11.10)
Volume Boot Record creation code.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
diff --git a/exfat/mkfs/vbr.h b/exfat/mkfs/vbr.h
index c3a6362e0..738d8d763 100644
--- a/exfat/mkfs/vbr.h
+++ b/exfat/mkfs/vbr.h
@@ -2,7 +2,7 @@
vbr.h (09.11.10)
Volume Boot Record creation code.
- Copyright (C) 2011, 2012 Andrew Nayenko
+ Copyright (C) 2011-2013 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
diff --git a/exfat/node.c b/exfat/node.c
deleted file mode 100644
index d5104038e..000000000
--- a/exfat/node.c
+++ /dev/null
@@ -1,1038 +0,0 @@
-/*
- node.c (09.10.09)
- exFAT file system implementation library.
-
- Copyright (C) 2010-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
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- 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/>.
-*/
-
-#include "exfat.h"
-#include <errno.h>
-#include <string.h>
-#include <inttypes.h>
-
-/* on-disk nodes iterator */
-struct iterator
-{
- cluster_t cluster;
- off64_t offset;
- int contiguous;
- char* chunk;
-};
-
-struct exfat_node* exfat_get_node(struct exfat_node* node)
-{
- /* if we switch to multi-threaded mode we will need atomic
- increment here and atomic decrement in exfat_put_node() */
- node->references++;
- return node;
-}
-
-void exfat_put_node(struct exfat* ef, struct exfat_node* node)
-{
- if (--node->references < 0)
- {
- char buffer[EXFAT_NAME_MAX + 1];
- exfat_get_name(node, buffer, EXFAT_NAME_MAX);
- exfat_bug("reference counter of `%s' is below zero", buffer);
- }
-
- if (node->references == 0)
- {
- if (node->flags & EXFAT_ATTRIB_DIRTY)
- exfat_flush_node(ef, node);
- if (node->flags & EXFAT_ATTRIB_UNLINKED)
- {
- /* free all clusters and node structure itself */
- exfat_truncate(ef, node, 0);
- free(node);
- }
- if (ef->cmap.dirty)
- exfat_flush_cmap(ef);
- }
-}
-
-/**
- * Cluster + offset from the beginning of the directory to absolute offset.
- */
-static off64_t co2o(struct exfat* ef, cluster_t cluster, off64_t offset)
-{
- return exfat_c2o(ef, cluster) + offset % CLUSTER_SIZE(*ef->sb);
-}
-
-static int opendir(struct exfat* ef, const struct exfat_node* dir,
- struct iterator* it)
-{
- if (!(dir->flags & EXFAT_ATTRIB_DIR))
- exfat_bug("not a directory");
- it->cluster = dir->start_cluster;
- it->offset = 0;
- it->contiguous = IS_CONTIGUOUS(*dir);
- it->chunk = malloc(CLUSTER_SIZE(*ef->sb));
- if (it->chunk == NULL)
- {
- exfat_error("out of memory");
- return -ENOMEM;
- }
- exfat_pread(ef->dev, it->chunk, CLUSTER_SIZE(*ef->sb),
- exfat_c2o(ef, it->cluster));
- return 0;
-}
-
-static void closedir(struct iterator* it)
-{
- it->cluster = 0;
- it->offset = 0;
- it->contiguous = 0;
- free(it->chunk);
- it->chunk = NULL;
-}
-
-static int fetch_next_entry(struct exfat* ef, const struct exfat_node* parent,
- struct iterator* it)
-{
- /* move iterator to the next entry in the directory */
- it->offset += sizeof(struct exfat_entry);
- /* fetch the next cluster if needed */
- if ((it->offset & (CLUSTER_SIZE(*ef->sb) - 1)) == 0)
- {
- /* reached the end of directory; the caller should check this
- condition too */
- if (it->offset >= parent->size)
- return 0;
- it->cluster = exfat_next_cluster(ef, parent, it->cluster);
- if (CLUSTER_INVALID(it->cluster))
- {
- exfat_error("invalid cluster 0x%x while reading directory",
- it->cluster);
- return 1;
- }
- exfat_pread(ef->dev, it->chunk, CLUSTER_SIZE(*ef->sb),
- exfat_c2o(ef, it->cluster));
- }
- return 0;
-}
-
-static struct exfat_node* allocate_node(void)
-{
- struct exfat_node* node = malloc(sizeof(struct exfat_node));
- if (node == NULL)
- {
- exfat_error("failed to allocate node");
- return NULL;
- }
- memset(node, 0, sizeof(struct exfat_node));
- return node;
-}
-
-static void init_node_meta1(struct exfat_node* node,
- const struct exfat_entry_meta1* meta1)
-{
- node->flags = le16_to_cpu(meta1->attrib);
- node->mtime = exfat_exfat2unix(meta1->mdate, meta1->mtime,
- meta1->mtime_cs);
- /* there is no centiseconds field for atime */
- node->atime = exfat_exfat2unix(meta1->adate, meta1->atime, 0);
-}
-
-static void init_node_meta2(struct exfat_node* node,
- const struct exfat_entry_meta2* meta2)
-{
- node->size = le64_to_cpu(meta2->size);
- node->start_cluster = le32_to_cpu(meta2->start_cluster);
- node->fptr_cluster = node->start_cluster;
- if (meta2->flags & EXFAT_FLAG_CONTIGUOUS)
- node->flags |= EXFAT_ATTRIB_CONTIGUOUS;
-}
-
-static const struct exfat_entry* get_entry_ptr(const struct exfat* ef,
- const struct iterator* it)
-{
- return (const struct exfat_entry*)
- (it->chunk + it->offset % CLUSTER_SIZE(*ef->sb));
-}
-
-/*
- * Reads one entry in directory at position pointed by iterator and fills
- * node structure.
- */
-static int readdir(struct exfat* ef, const struct exfat_node* parent,
- struct exfat_node** node, struct iterator* it)
-{
- int rc = -EIO;
- const struct exfat_entry* entry;
- const struct exfat_entry_meta1* meta1;
- const struct exfat_entry_meta2* meta2;
- const struct exfat_entry_name* file_name;
- const struct exfat_entry_upcase* upcase;
- const struct exfat_entry_bitmap* bitmap;
- const struct exfat_entry_label* label;
- uint8_t continuations = 0;
- le16_t* namep = NULL;
- uint16_t reference_checksum = 0;
- uint16_t actual_checksum = 0;
- uint64_t real_size = 0;
-
- *node = NULL;
-
- for (;;)
- {
- if (it->offset >= parent->size)
- {
- if (continuations != 0)
- {
- exfat_error("expected %hhu continuations", continuations);
- goto error;
- }
- return -ENOENT; /* that's OK, means end of directory */
- }
-
- entry = get_entry_ptr(ef, it);
- switch (entry->type)
- {
- case EXFAT_ENTRY_FILE:
- if (continuations != 0)
- {
- exfat_error("expected %hhu continuations before new entry",
- continuations);
- goto error;
- }
- meta1 = (const struct exfat_entry_meta1*) entry;
- continuations = meta1->continuations;
- /* each file entry must have at least 2 continuations:
- info and name */
- if (continuations < 2)
- {
- exfat_error("too few continuations (%hhu)", continuations);
- goto error;
- }
- reference_checksum = le16_to_cpu(meta1->checksum);
- actual_checksum = exfat_start_checksum(meta1);
- *node = allocate_node();
- if (*node == NULL)
- {
- rc = -ENOMEM;
- goto error;
- }
- /* new node has zero reference counter */
- (*node)->entry_cluster = it->cluster;
- (*node)->entry_offset = it->offset;
- init_node_meta1(*node, meta1);
- namep = (*node)->name;
- break;
-
- case EXFAT_ENTRY_FILE_INFO:
- if (continuations < 2)
- {
- exfat_error("unexpected continuation (%hhu)",
- continuations);
- goto error;
- }
- meta2 = (const struct exfat_entry_meta2*) entry;
- if (meta2->flags & ~(EXFAT_FLAG_ALWAYS1 | EXFAT_FLAG_CONTIGUOUS))
- {
- exfat_error("unknown flags in meta2 (0x%hhx)", meta2->flags);
- goto error;
- }
- init_node_meta2(*node, meta2);
- actual_checksum = exfat_add_checksum(entry, actual_checksum);
- real_size = le64_to_cpu(meta2->real_size);
- /* empty files must be marked as non-contiguous */
- if ((*node)->size == 0 && (meta2->flags & EXFAT_FLAG_CONTIGUOUS))
- {
- exfat_error("empty file marked as contiguous (0x%hhx)",
- meta2->flags);
- goto error;
- }
- /* directories must be aligned on at cluster boundary */
- if (((*node)->flags & EXFAT_ATTRIB_DIR) &&
- (*node)->size % CLUSTER_SIZE(*ef->sb) != 0)
- {
- exfat_error("directory has invalid size %"PRIu64" bytes",
- (*node)->size);
- goto error;
- }
- --continuations;
- break;
-
- case EXFAT_ENTRY_FILE_NAME:
- if (continuations == 0)
- {
- exfat_error("unexpected continuation");
- goto error;
- }
- file_name = (const struct exfat_entry_name*) entry;
- actual_checksum = exfat_add_checksum(entry, actual_checksum);
-
- memcpy(namep, file_name->name, EXFAT_ENAME_MAX * sizeof(le16_t));
- namep += EXFAT_ENAME_MAX;
- if (--continuations == 0)
- {
- /*
- There are two fields that contain file size. Maybe they
- plan to add compression support in the future and one of
- those fields is visible (uncompressed) size and the other
- is real (compressed) size. Anyway, currently it looks like
- exFAT does not support compression and both fields must be
- equal.
-
- There is an exception though: pagefile.sys (its real_size
- is always 0).
- */
- if (real_size != (*node)->size)
- {
- char buffer[EXFAT_NAME_MAX + 1];
-
- exfat_get_name(*node, buffer, EXFAT_NAME_MAX);
- exfat_error("`%s' real size does not equal to size "
- "(%"PRIu64" != %"PRIu64")", buffer,
- real_size, (*node)->size);
- goto error;
- }
- if (actual_checksum != reference_checksum)
- {
- char buffer[EXFAT_NAME_MAX + 1];
-
- exfat_get_name(*node, buffer, EXFAT_NAME_MAX);
- exfat_error("`%s' has invalid checksum (0x%hx != 0x%hx)",
- buffer, actual_checksum, reference_checksum);
- goto error;
- }
- if (fetch_next_entry(ef, parent, it) != 0)
- goto error;
- return 0; /* entry completed */
- }
- break;
-
- case EXFAT_ENTRY_UPCASE:
- if (ef->upcase != NULL)
- break;
- upcase = (const struct exfat_entry_upcase*) entry;
- if (CLUSTER_INVALID(le32_to_cpu(upcase->start_cluster)))
- {
- exfat_error("invalid cluster 0x%x in upcase table",
- le32_to_cpu(upcase->start_cluster));
- goto error;
- }
- if (le64_to_cpu(upcase->size) == 0 ||
- le64_to_cpu(upcase->size) > 0xffff * sizeof(uint16_t) ||
- le64_to_cpu(upcase->size) % sizeof(uint16_t) != 0)
- {
- exfat_error("bad upcase table size (%"PRIu64" bytes)",
- le64_to_cpu(upcase->size));
- goto error;
- }
- ef->upcase = malloc(le64_to_cpu(upcase->size));
- if (ef->upcase == NULL)
- {
- exfat_error("failed to allocate upcase table (%"PRIu64" bytes)",
- le64_to_cpu(upcase->size));
- rc = -ENOMEM;
- goto error;
- }
- ef->upcase_chars = le64_to_cpu(upcase->size) / sizeof(le16_t);
-
- exfat_pread(ef->dev, ef->upcase, le64_to_cpu(upcase->size),
- exfat_c2o(ef, le32_to_cpu(upcase->start_cluster)));
- break;
-
- case EXFAT_ENTRY_BITMAP:
- bitmap = (const struct exfat_entry_bitmap*) entry;
- ef->cmap.start_cluster = le32_to_cpu(bitmap->start_cluster);
- if (CLUSTER_INVALID(ef->cmap.start_cluster))
- {
- exfat_error("invalid cluster 0x%x in clusters bitmap",
- ef->cmap.start_cluster);
- goto error;
- }
- ef->cmap.size = le32_to_cpu(ef->sb->cluster_count) -
- EXFAT_FIRST_DATA_CLUSTER;
- if (le64_to_cpu(bitmap->size) < (ef->cmap.size + 7) / 8)
- {
- exfat_error("invalid clusters bitmap size: %"PRIu64
- " (expected at least %u)",
- le64_to_cpu(bitmap->size), (ef->cmap.size + 7) / 8);
- goto error;
- }
- /* FIXME bitmap can be rather big, up to 512 MB */
- ef->cmap.chunk_size = ef->cmap.size;
- ef->cmap.chunk = malloc(le64_to_cpu(bitmap->size));
- if (ef->cmap.chunk == NULL)
- {
- exfat_error("failed to allocate clusters bitmap chunk "
- "(%"PRIu64" bytes)", le64_to_cpu(bitmap->size));
- rc = -ENOMEM;
- goto error;
- }
-
- exfat_pread(ef->dev, ef->cmap.chunk, le64_to_cpu(bitmap->size),
- exfat_c2o(ef, ef->cmap.start_cluster));
- break;
-
- case EXFAT_ENTRY_LABEL:
- label = (const struct exfat_entry_label*) entry;
- if (label->length > EXFAT_ENAME_MAX)
- {
- exfat_error("too long label (%hhu chars)", label->length);
- goto error;
- }
- if (utf16_to_utf8(ef->label, label->name,
- sizeof(ef->label), EXFAT_ENAME_MAX) != 0)
- goto error;
- break;
-
- default:
- if (entry->type & EXFAT_ENTRY_VALID)
- {
- exfat_error("unknown entry type 0x%hhx", entry->type);
- goto error;
- }
- break;
- }
-
- if (fetch_next_entry(ef, parent, it) != 0)
- goto error;
- }
- /* we never reach here */
-
-error:
- free(*node);
- *node = NULL;
- return rc;
-}
-
-int exfat_cache_directory(struct exfat* ef, struct exfat_node* dir)
-{
- struct iterator it;
- int rc;
- struct exfat_node* node;
- struct exfat_node* current = NULL;
-
- if (dir->flags & EXFAT_ATTRIB_CACHED)
- return 0; /* already cached */
-
- rc = opendir(ef, dir, &it);
- if (rc != 0)
- return rc;
- while ((rc = readdir(ef, dir, &node, &it)) == 0)
- {
- node->parent = dir;
- if (current != NULL)
- {
- current->next = node;
- node->prev = current;
- }
- else
- dir->child = node;
-
- current = node;
- }
- closedir(&it);
-
- if (rc != -ENOENT)
- {
- /* rollback */
- for (current = dir->child; current; current = node)
- {
- node = current->next;
- free(current);
- }
- dir->child = NULL;
- return rc;
- }
-
- dir->flags |= EXFAT_ATTRIB_CACHED;
- return 0;
-}
-
-static void tree_attach(struct exfat_node* dir, struct exfat_node* node)
-{
- node->parent = dir;
- if (dir->child)
- {
- dir->child->prev = node;
- node->next = dir->child;
- }
- dir->child = node;
-}
-
-static void tree_detach(struct exfat_node* node)
-{
- if (node->prev)
- node->prev->next = node->next;
- else /* this is the first node in the list */
- node->parent->child = node->next;
- if (node->next)
- node->next->prev = node->prev;
- node->parent = NULL;
- node->prev = NULL;
- node->next = NULL;
-}
-
-static void reset_cache(struct exfat* ef, struct exfat_node* node)
-{
- while (node->child)
- {
- struct exfat_node* p = node->child;
- reset_cache(ef, p);
- tree_detach(p);
- free(p);
- }
- node->flags &= ~EXFAT_ATTRIB_CACHED;
- if (node->references != 0)
- {
- char buffer[EXFAT_NAME_MAX + 1];
- exfat_get_name(node, buffer, EXFAT_NAME_MAX);
- exfat_warn("non-zero reference counter (%d) for `%s'",
- node->references, buffer);
- }
- while (node->references)
- exfat_put_node(ef, node);
-}
-
-void exfat_reset_cache(struct exfat* ef)
-{
- reset_cache(ef, ef->root);
-}
-
-void next_entry(struct exfat* ef, const struct exfat_node* parent,
- cluster_t* cluster, off64_t* offset)
-{
- *offset += sizeof(struct exfat_entry);
- if (*offset % CLUSTER_SIZE(*ef->sb) == 0)
- /* next cluster cannot be invalid */
- *cluster = exfat_next_cluster(ef, parent, *cluster);
-}
-
-void exfat_flush_node(struct exfat* ef, struct exfat_node* node)
-{
- cluster_t cluster;
- off64_t offset;
- off64_t meta1_offset, meta2_offset;
- struct exfat_entry_meta1 meta1;
- struct exfat_entry_meta2 meta2;
-
- if (ef->ro)
- exfat_bug("unable to flush node to read-only FS");
-
- if (node->parent == NULL)
- return; /* do not flush unlinked node */
-
- cluster = node->entry_cluster;
- offset = node->entry_offset;
- meta1_offset = co2o(ef, cluster, offset);
- next_entry(ef, node->parent, &cluster, &offset);
- meta2_offset = co2o(ef, cluster, offset);
-
- exfat_pread(ef->dev, &meta1, sizeof(meta1), meta1_offset);
- if (meta1.type != EXFAT_ENTRY_FILE)
- exfat_bug("invalid type of meta1: 0x%hhx", meta1.type);
- meta1.attrib = cpu_to_le16(node->flags);
- exfat_unix2exfat(node->mtime, &meta1.mdate, &meta1.mtime, &meta1.mtime_cs);
- exfat_unix2exfat(node->atime, &meta1.adate, &meta1.atime, NULL);
-
- exfat_pread(ef->dev, &meta2, sizeof(meta2), meta2_offset);
- if (meta2.type != EXFAT_ENTRY_FILE_INFO)
- exfat_bug("invalid type of meta2: 0x%hhx", meta2.type);
- meta2.size = meta2.real_size = cpu_to_le64(node->size);
- meta2.start_cluster = cpu_to_le32(node->start_cluster);
- meta2.flags = EXFAT_FLAG_ALWAYS1;
- /* empty files must not be marked as contiguous */
- if (node->size != 0 && IS_CONTIGUOUS(*node))
- meta2.flags |= EXFAT_FLAG_CONTIGUOUS;
- /* name hash remains unchanged, no need to recalculate it */
-
- meta1.checksum = exfat_calc_checksum(&meta1, &meta2, node->name);
-
- exfat_pwrite(ef->dev, &meta1, sizeof(meta1), meta1_offset);
- exfat_pwrite(ef->dev, &meta2, sizeof(meta2), meta2_offset);
-
- node->flags &= ~EXFAT_ATTRIB_DIRTY;
-}
-
-static void erase_entry(struct exfat* ef, struct exfat_node* node)
-{
- cluster_t cluster = node->entry_cluster;
- off64_t offset = node->entry_offset;
- int name_entries = DIV_ROUND_UP(utf16_length(node->name), EXFAT_ENAME_MAX);
- uint8_t entry_type;
-
- entry_type = EXFAT_ENTRY_FILE & ~EXFAT_ENTRY_VALID;
- exfat_pwrite(ef->dev, &entry_type, 1, co2o(ef, cluster, offset));
-
- next_entry(ef, node->parent, &cluster, &offset);
- entry_type = EXFAT_ENTRY_FILE_INFO & ~EXFAT_ENTRY_VALID;
- exfat_pwrite(ef->dev, &entry_type, 1, co2o(ef, cluster, offset));
-
- while (name_entries--)
- {
- next_entry(ef, node->parent, &cluster, &offset);
- entry_type = EXFAT_ENTRY_FILE_NAME & ~EXFAT_ENTRY_VALID;
- exfat_pwrite(ef->dev, &entry_type, 1, co2o(ef, cluster, offset));
- }
-}
-
-static int shrink_directory(struct exfat* ef, struct exfat_node* dir,
- off64_t deleted_offset)
-{
- const struct exfat_node* node;
- const struct exfat_node* last_node;
- uint64_t entries = 0;
- uint64_t new_size;
- int rc;
-
- if (!(dir->flags & EXFAT_ATTRIB_DIR))
- exfat_bug("attempted to shrink a file");
- if (!(dir->flags & EXFAT_ATTRIB_CACHED))
- exfat_bug("attempted to shrink uncached directory");
-
- for (last_node = node = dir->child; node; node = node->next)
- {
- if (deleted_offset < node->entry_offset)
- {
- /* there are other entries after the removed one, no way to shrink
- this directory */
- return 0;
- }
- if (last_node->entry_offset < node->entry_offset)
- last_node = node;
- }
-
- if (last_node)
- {
- /* offset of the last entry */
- entries += last_node->entry_offset / sizeof(struct exfat_entry);
- /* two subentries with meta info */
- entries += 2;
- /* subentries with file name */
- entries += DIV_ROUND_UP(utf16_length(last_node->name),
- EXFAT_ENAME_MAX);
- }
-
- new_size = DIV_ROUND_UP(entries * sizeof(struct exfat_entry),
- CLUSTER_SIZE(*ef->sb)) * CLUSTER_SIZE(*ef->sb);
- if (new_size == 0) /* directory always has at least 1 cluster */
- new_size = CLUSTER_SIZE(*ef->sb);
- if (new_size == dir->size)
- return 0;
- rc = exfat_truncate(ef, dir, new_size);
- if (rc != 0)
- return rc;
- return 0;
-}
-
-static int delete(struct exfat* ef, struct exfat_node* node)
-{
- struct exfat_node* parent = node->parent;
- off64_t deleted_offset = node->entry_offset;
- int rc;
-
- exfat_get_node(parent);
- erase_entry(ef, node);
- exfat_update_mtime(parent);
- tree_detach(node);
- rc = shrink_directory(ef, parent, deleted_offset);
- exfat_put_node(ef, parent);
- /* file clusters will be freed when node reference counter becomes 0 */
- node->flags |= EXFAT_ATTRIB_UNLINKED;
- return rc;
-}
-
-int exfat_unlink(struct exfat* ef, struct exfat_node* node)
-{
- if (node->flags & EXFAT_ATTRIB_DIR)
- return -EISDIR;
- return delete(ef, node);
-}
-
-int exfat_rmdir(struct exfat* ef, struct exfat_node* node)
-{
- if (!(node->flags & EXFAT_ATTRIB_DIR))
- return -ENOTDIR;
- /* check that directory is empty */
- exfat_cache_directory(ef, node);
- if (node->child)
- return -ENOTEMPTY;
- return delete(ef, node);
-}
-
-static int grow_directory(struct exfat* ef, struct exfat_node* dir,
- uint64_t asize, uint32_t difference)
-{
- return exfat_truncate(ef, dir,
- DIV_ROUND_UP(asize + difference, CLUSTER_SIZE(*ef->sb))
- * CLUSTER_SIZE(*ef->sb));
-}
-
-static int find_slot(struct exfat* ef, struct exfat_node* dir,
- cluster_t* cluster, off64_t* offset, int subentries)
-{
- struct iterator it;
- int rc;
- const struct exfat_entry* entry;
- int contiguous = 0;
-
- rc = opendir(ef, dir, &it);
- if (rc != 0)
- return rc;
- for (;;)
- {
- if (contiguous == 0)
- {
- *cluster = it.cluster;
- *offset = it.offset;
- }
- entry = get_entry_ptr(ef, &it);
- if (entry->type & EXFAT_ENTRY_VALID)
- contiguous = 0;
- else
- contiguous++;
- if (contiguous == subentries)
- break; /* suitable slot is found */
- if (it.offset + sizeof(struct exfat_entry) >= dir->size)
- {
- rc = grow_directory(ef, dir, dir->size,
- (subentries - contiguous) * sizeof(struct exfat_entry));
- if (rc != 0)
- {
- closedir(&it);
- return rc;
- }
- }
- if (fetch_next_entry(ef, dir, &it) != 0)
- {
- closedir(&it);
- return -EIO;
- }
- }
- closedir(&it);
- return 0;
-}
-
-static int write_entry(struct exfat* ef, struct exfat_node* dir,
- const le16_t* name, cluster_t cluster, off64_t offset, uint16_t attrib)
-{
- struct exfat_node* node;
- struct exfat_entry_meta1 meta1;
- struct exfat_entry_meta2 meta2;
- const size_t name_length = utf16_length(name);
- const int name_entries = DIV_ROUND_UP(name_length, EXFAT_ENAME_MAX);
- int i;
-
- node = allocate_node();
- if (node == NULL)
- return -ENOMEM;
- node->entry_cluster = cluster;
- node->entry_offset = offset;
- memcpy(node->name, name, name_length * sizeof(le16_t));
-
- memset(&meta1, 0, sizeof(meta1));
- meta1.type = EXFAT_ENTRY_FILE;
- meta1.continuations = 1 + name_entries;
- meta1.attrib = cpu_to_le16(attrib);
- exfat_unix2exfat(time(NULL), &meta1.crdate, &meta1.crtime,
- &meta1.crtime_cs);
- meta1.adate = meta1.mdate = meta1.crdate;
- meta1.atime = meta1.mtime = meta1.crtime;
- meta1.mtime_cs = meta1.crtime_cs; /* there is no atime_cs */
-
- memset(&meta2, 0, sizeof(meta2));
- meta2.type = EXFAT_ENTRY_FILE_INFO;
- meta2.flags = EXFAT_FLAG_ALWAYS1;
- meta2.name_length = name_length;
- meta2.name_hash = exfat_calc_name_hash(ef, node->name);
- meta2.start_cluster = cpu_to_le32(EXFAT_CLUSTER_FREE);
-
- meta1.checksum = exfat_calc_checksum(&meta1, &meta2, node->name);
-
- exfat_pwrite(ef->dev, &meta1, sizeof(meta1), co2o(ef, cluster, offset));
- next_entry(ef, dir, &cluster, &offset);
- exfat_pwrite(ef->dev, &meta2, sizeof(meta2), co2o(ef, cluster, offset));
- for (i = 0; i < name_entries; i++)
- {
- struct exfat_entry_name name_entry = {EXFAT_ENTRY_FILE_NAME, 0};
- memcpy(name_entry.name, node->name + i * EXFAT_ENAME_MAX,
- EXFAT_ENAME_MAX * sizeof(le16_t));
- next_entry(ef, dir, &cluster, &offset);
- exfat_pwrite(ef->dev, &name_entry, sizeof(name_entry),
- co2o(ef, cluster, offset));
- }
-
- init_node_meta1(node, &meta1);
- init_node_meta2(node, &meta2);
-
- tree_attach(dir, node);
- exfat_update_mtime(dir);
- return 0;
-}
-
-static int create(struct exfat* ef, const char* path, uint16_t attrib)
-{
- struct exfat_node* dir;
- struct exfat_node* existing;
- cluster_t cluster = EXFAT_CLUSTER_BAD;
- off64_t offset = -1;
- le16_t name[EXFAT_NAME_MAX + 1];
- int rc;
-
- rc = exfat_split(ef, &dir, &existing, name, path);
- if (rc != 0)
- return rc;
- if (existing != NULL)
- {
- exfat_put_node(ef, existing);
- exfat_put_node(ef, dir);
- return -EEXIST;
- }
-
- rc = find_slot(ef, dir, &cluster, &offset,
- 2 + DIV_ROUND_UP(utf16_length(name), EXFAT_ENAME_MAX));
- if (rc != 0)
- {
- exfat_put_node(ef, dir);
- return rc;
- }
- rc = write_entry(ef, dir, name, cluster, offset, attrib);
- exfat_put_node(ef, dir);
- return rc;
-}
-
-int exfat_mknod(struct exfat* ef, const char* path)
-{
- return create(ef, path, EXFAT_ATTRIB_ARCH);
-}
-
-int exfat_mkdir(struct exfat* ef, const char* path)
-{
- int rc;
- struct exfat_node* node;
-
- rc = create(ef, path, EXFAT_ATTRIB_ARCH | EXFAT_ATTRIB_DIR);
- if (rc != 0)
- return rc;
- rc = exfat_lookup(ef, &node, path);
- if (rc != 0)
- return 0;
- /* directories always have at least one cluster */
- rc = exfat_truncate(ef, node, CLUSTER_SIZE(*ef->sb));
- if (rc != 0)
- {
- delete(ef, node);
- exfat_put_node(ef, node);
- return rc;
- }
- exfat_put_node(ef, node);
- return 0;
-}
-
-static void rename_entry(struct exfat* ef, struct exfat_node* dir,
- struct exfat_node* node, const le16_t* name, cluster_t new_cluster,
- off64_t new_offset)
-{
- struct exfat_entry_meta1 meta1;
- struct exfat_entry_meta2 meta2;
- cluster_t old_cluster = node->entry_cluster;
- off64_t old_offset = node->entry_offset;
- const size_t name_length = utf16_length(name);
- const int name_entries = DIV_ROUND_UP(name_length, EXFAT_ENAME_MAX);
- int i;
-
- exfat_pread(ef->dev, &meta1, sizeof(meta1),
- co2o(ef, old_cluster, old_offset));
- next_entry(ef, node->parent, &old_cluster, &old_offset);
- exfat_pread(ef->dev, &meta2, sizeof(meta2),
- co2o(ef, old_cluster, old_offset));
- meta1.continuations = 1 + name_entries;
- meta2.name_hash = exfat_calc_name_hash(ef, name);
- meta2.name_length = name_length;
- meta1.checksum = exfat_calc_checksum(&meta1, &meta2, name);
-
- erase_entry(ef, node);
-
- node->entry_cluster = new_cluster;
- node->entry_offset = new_offset;
-
- exfat_pwrite(ef->dev, &meta1, sizeof(meta1),
- co2o(ef, new_cluster, new_offset));
- next_entry(ef, dir, &new_cluster, &new_offset);
- exfat_pwrite(ef->dev, &meta2, sizeof(meta2),
- co2o(ef, new_cluster, new_offset));
-
- for (i = 0; i < name_entries; i++)
- {
- struct exfat_entry_name name_entry = {EXFAT_ENTRY_FILE_NAME, 0};
- memcpy(name_entry.name, name + i * EXFAT_ENAME_MAX,
- EXFAT_ENAME_MAX * sizeof(le16_t));
- next_entry(ef, dir, &new_cluster, &new_offset);
- exfat_pwrite(ef->dev, &name_entry, sizeof(name_entry),
- co2o(ef, new_cluster, new_offset));
- }
-
- memcpy(node->name, name, (EXFAT_NAME_MAX + 1) * sizeof(le16_t));
- tree_detach(node);
- tree_attach(dir, node);
-}
-
-int exfat_rename(struct exfat* ef, const char* old_path, const char* new_path)
-{
- struct exfat_node* node;
- struct exfat_node* existing;
- struct exfat_node* dir;
- cluster_t cluster = EXFAT_CLUSTER_BAD;
- off64_t offset = -1;
- le16_t name[EXFAT_NAME_MAX + 1];
- int rc;
-
- rc = exfat_lookup(ef, &node, old_path);
- if (rc != 0)
- return rc;
-
- rc = exfat_split(ef, &dir, &existing, name, new_path);
- if (rc != 0)
- {
- exfat_put_node(ef, node);
- return rc;
- }
- if (existing != NULL)
- {
- /* remove target if it's not the same node as source */
- if (existing != node)
- {
- if (existing->flags & EXFAT_ATTRIB_DIR)
- {
- if (node->flags & EXFAT_ATTRIB_DIR)
- rc = exfat_rmdir(ef, existing);
- else
- rc = -ENOTDIR;
- }
- else
- {
- if (!(node->flags & EXFAT_ATTRIB_DIR))
- rc = exfat_unlink(ef, existing);
- else
- rc = -EISDIR;
- }
- exfat_put_node(ef, existing);
- if (rc != 0)
- {
- exfat_put_node(ef, dir);
- exfat_put_node(ef, node);
- return rc;
- }
- }
- else
- exfat_put_node(ef, existing);
- }
-
- rc = find_slot(ef, dir, &cluster, &offset,
- 2 + DIV_ROUND_UP(utf16_length(name), EXFAT_ENAME_MAX));
- if (rc != 0)
- {
- exfat_put_node(ef, dir);
- exfat_put_node(ef, node);
- return rc;
- }
- rename_entry(ef, dir, node, name, cluster, offset);
- exfat_put_node(ef, dir);
- exfat_put_node(ef, node);
- return 0;
-}
-
-void exfat_utimes(struct exfat_node* node, const struct timespec tv[2])
-{
- node->atime = tv[0].tv_sec;
- node->mtime = tv[1].tv_sec;
- node->flags |= EXFAT_ATTRIB_DIRTY;
-}
-
-void exfat_update_atime(struct exfat_node* node)
-{
- node->atime = time(NULL);
- node->flags |= EXFAT_ATTRIB_DIRTY;
-}
-
-void exfat_update_mtime(struct exfat_node* node)
-{
- node->mtime = time(NULL);
- node->flags |= EXFAT_ATTRIB_DIRTY;
-}
-
-const char* exfat_get_label(struct exfat* ef)
-{
- return ef->label;
-}
-
-static int find_label(struct exfat* ef, cluster_t* cluster, off64_t* offset)
-{
- struct iterator it;
- int rc;
-
- rc = opendir(ef, ef->root, &it);
- if (rc != 0)
- return rc;
-
- for (;;)
- {
- if (it.offset >= ef->root->size)
- {
- closedir(&it);
- return -ENOENT;
- }
-
- if (get_entry_ptr(ef, &it)->type == EXFAT_ENTRY_LABEL)
- {
- *cluster = it.cluster;
- *offset = it.offset;
- closedir(&it);
- return 0;
- }
-
- if (fetch_next_entry(ef, ef->root, &it) != 0)
- {
- closedir(&it);
- return -EIO;
- }
- }
-}
-
-int exfat_set_label(struct exfat* ef, const char* label)
-{
- le16_t label_utf16[EXFAT_ENAME_MAX + 1];
- int rc;
- cluster_t cluster;
- off64_t offset;
- struct exfat_entry_label entry;
-
- memset(label_utf16, 0, sizeof(label_utf16));
- rc = utf8_to_utf16(label_utf16, label, EXFAT_ENAME_MAX, strlen(label));
- if (rc != 0)
- return rc;
-
- rc = find_label(ef, &cluster, &offset);
- if (rc == -ENOENT)
- rc = find_slot(ef, ef->root, &cluster, &offset, 1);
- if (rc != 0)
- return rc;
-
- entry.type = EXFAT_ENTRY_LABEL;
- entry.length = utf16_length(label_utf16);
- memcpy(entry.name, label_utf16, sizeof(entry.name));
- if (entry.length == 0)
- entry.type ^= EXFAT_ENTRY_VALID;
-
- exfat_pwrite(ef->dev, &entry, sizeof(struct exfat_entry_label),
- co2o(ef, cluster, offset));
- return 0;
-}