void exfat_put_node(struct exfat* ef, struct exfat_node* node)
{
- char buffer[UTF8_BYTES(EXFAT_NAME_MAX) + 1];
+ char buffer[EXFAT_UTF8_NAME_BUFFER_MAX];
--node->references;
if (node->references < 0)
{
- exfat_get_name(node, buffer, sizeof(buffer) - 1);
+ exfat_get_name(node, buffer);
exfat_bug("reference counter of '%s' is below zero", buffer);
}
else if (node->references == 0 && node != ef->root)
{
- if (node->flags & EXFAT_ATTRIB_DIRTY)
+ if (node->is_dirty)
{
- exfat_get_name(node, buffer, sizeof(buffer) - 1);
+ exfat_get_name(node, buffer);
exfat_warn("dirty node '%s' with zero references", buffer);
}
}
exfat_bug("unable to cleanup a node with %d references",
node->references);
- if (node->flags & EXFAT_ATTRIB_UNLINKED)
+ if (node->is_unlinked)
{
/* free all clusters and node structure itself */
rc = exfat_truncate(ef, node, 0, true);
static int opendir(struct exfat* ef, const struct exfat_node* dir,
struct iterator* it)
{
- char buffer[UTF8_BYTES(EXFAT_NAME_MAX) + 1];
+ char buffer[EXFAT_UTF8_NAME_BUFFER_MAX];
- if (!(dir->flags & EXFAT_ATTRIB_DIR))
+ if (!(dir->attrib & EXFAT_ATTRIB_DIR))
{
- exfat_get_name(dir, buffer, sizeof(buffer) - 1);
+ exfat_get_name(dir, buffer);
exfat_bug("'%s' is not a directory", buffer);
}
+ if (CLUSTER_INVALID(dir->start_cluster))
+ {
+ exfat_get_name(dir, buffer);
+ exfat_error("'%s' directory starts with invalid cluster %#x", buffer,
+ dir->start_cluster);
+ return -EIO;
+ }
it->cluster = dir->start_cluster;
it->offset = 0;
it->chunk = malloc(CLUSTER_SIZE(*ef->sb));
exfat_c2o(ef, it->cluster)) < 0)
{
free(it->chunk);
- exfat_get_name(dir, buffer, sizeof(buffer) - 1);
+ exfat_get_name(dir, buffer);
exfat_error("failed to read '%s' directory cluster %#x", buffer,
it->cluster);
return -EIO;
static void init_node_meta1(struct exfat_node* node,
const struct exfat_entry_meta1* meta1)
{
- node->flags = le16_to_cpu(meta1->attrib);
+ node->attrib = le16_to_cpu(meta1->attrib);
node->mtime = exfat_exfat2unix(meta1->mdate, meta1->mtime,
meta1->mtime_cs);
/* there is no centiseconds field for atime */
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;
+ node->is_contiguous = ((meta2->flags & EXFAT_FLAG_CONTIGUOUS) != 0);
}
static const struct exfat_entry* get_entry_ptr(const struct exfat* ef,
}
static bool check_node(const struct exfat_node* node, uint16_t actual_checksum,
- uint16_t reference_checksum, uint64_t valid_size)
+ uint16_t reference_checksum, uint64_t valid_size, int cluster_size)
{
- char buffer[UTF8_BYTES(EXFAT_NAME_MAX) + 1];
+ char buffer[EXFAT_UTF8_NAME_BUFFER_MAX];
bool ret = true;
/*
*/
if (actual_checksum != reference_checksum)
{
- exfat_get_name(node, buffer, sizeof(buffer) - 1);
+ exfat_get_name(node, buffer);
exfat_error("'%s' has invalid checksum (%#hx != %#hx)", buffer,
actual_checksum, reference_checksum);
ret = false;
*/
if (valid_size > node->size)
{
- exfat_get_name(node, buffer, sizeof(buffer) - 1);
+ exfat_get_name(node, buffer);
exfat_error("'%s' has valid size (%"PRIu64") greater than size "
"(%"PRIu64")", buffer, valid_size, node->size);
ret = false;
}
+ /*
+ Empty file must have zero start cluster. Non-empty file must start
+ with a valid cluster. Directories cannot be empty (i.e. must always
+ have a valid start cluster), but we will check this later in opendir()
+ to give user a chance to read current directory.
+ */
+ if (node->size == 0 && node->start_cluster != EXFAT_CLUSTER_FREE)
+ {
+ exfat_get_name(node, buffer);
+ exfat_error("'%s' is empty but start cluster is %#x", buffer,
+ node->start_cluster);
+ ret = false;
+ }
+ if (node->size > 0 && CLUSTER_INVALID(node->start_cluster))
+ {
+ exfat_get_name(node, buffer);
+ exfat_error("'%s' points to invalid cluster %#x", buffer,
+ node->start_cluster);
+ ret = false;
+ }
+
+ /* Empty file or directory must be marked as non-contiguous. */
+ if (node->size == 0 && node->is_contiguous)
+ {
+ exfat_get_name(node, buffer);
+ exfat_error("'%s' is empty but marked as contiguous (%#hx)", buffer,
+ node->attrib);
+ ret = false;
+ }
+
+ /* Directory size must be aligned on at cluster boundary. */
+ if ((node->attrib & EXFAT_ATTRIB_DIR) && node->size % cluster_size != 0)
+ {
+ exfat_get_name(node, buffer);
+ exfat_error("'%s' directory size %"PRIu64" is not divisible by %d", buffer,
+ node->size, cluster_size);
+ ret = false;
+ }
+
return ret;
}
init_node_meta2(*node, meta2);
actual_checksum = exfat_add_checksum(entry, actual_checksum);
valid_size = le64_to_cpu(meta2->valid_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;
if (--continuations == 0)
{
if (!check_node(*node, actual_checksum, reference_checksum,
- valid_size))
+ valid_size, CLUSTER_SIZE(*ef->sb)))
goto error;
if (!fetch_next_entry(ef, parent, it))
goto error;
goto error;
}
if (utf16_to_utf8(ef->label, label->name,
- sizeof(ef->label) - 1, EXFAT_ENAME_MAX) != 0)
+ sizeof(ef->label), EXFAT_ENAME_MAX) != 0)
goto error;
break;
struct exfat_node* node;
struct exfat_node* current = NULL;
- if (dir->flags & EXFAT_ATTRIB_CACHED)
+ if (dir->is_cached)
return 0; /* already cached */
rc = opendir(ef, dir, &it);
return rc;
}
- dir->flags |= EXFAT_ATTRIB_CACHED;
+ dir->is_cached = true;
return 0;
}
static void reset_cache(struct exfat* ef, struct exfat_node* node)
{
- char buffer[UTF8_BYTES(EXFAT_NAME_MAX) + 1];
+ char buffer[EXFAT_UTF8_NAME_BUFFER_MAX];
while (node->child)
{
tree_detach(p);
free(p);
}
- node->flags &= ~EXFAT_ATTRIB_CACHED;
+ node->is_cached = false;
if (node->references != 0)
{
- exfat_get_name(node, buffer, sizeof(buffer) - 1);
+ exfat_get_name(node, buffer);
exfat_warn("non-zero reference counter (%d) for '%s'",
node->references, buffer);
}
- if (node != ef->root && (node->flags & EXFAT_ATTRIB_DIRTY))
+ if (node != ef->root && node->is_dirty)
{
- exfat_get_name(node, buffer, sizeof(buffer) - 1);
+ exfat_get_name(node, buffer);
exfat_bug("node '%s' is dirty", buffer);
}
while (node->references)
struct exfat_entry_meta1 meta1;
struct exfat_entry_meta2 meta2;
- if (!(node->flags & EXFAT_ATTRIB_DIRTY))
+ if (!node->is_dirty)
return 0; /* no need to flush */
if (ef->ro)
}
if (meta1.type != EXFAT_ENTRY_FILE)
exfat_bug("invalid type of meta1: 0x%hhx", meta1.type);
- meta1.attrib = cpu_to_le16(node->flags);
+ meta1.attrib = cpu_to_le16(node->attrib);
exfat_unix2exfat(node->mtime, &meta1.mdate, &meta1.mtime, &meta1.mtime_cs);
exfat_unix2exfat(node->atime, &meta1.adate, &meta1.atime, NULL);
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))
+ if (node->size != 0 && node->is_contiguous)
meta2.flags |= EXFAT_FLAG_CONTIGUOUS;
/* name hash remains unchanged, no need to recalculate it */
return -EIO;
}
- node->flags &= ~EXFAT_ATTRIB_DIRTY;
+ node->is_dirty = false;
return exfat_flush(ef);
}
uint64_t entries = 0;
uint64_t new_size;
- if (!(dir->flags & EXFAT_ATTRIB_DIR))
+ if (!(dir->attrib & EXFAT_ATTRIB_DIR))
exfat_bug("attempted to shrink a file");
- if (!(dir->flags & EXFAT_ATTRIB_CACHED))
+ if (!dir->is_cached)
exfat_bug("attempted to shrink uncached directory");
for (last_node = node = dir->child; node; node = node->next)
exfat_update_mtime(parent);
tree_detach(node);
rc = shrink_directory(ef, parent, deleted_offset);
- node->flags |= EXFAT_ATTRIB_UNLINKED;
+ node->is_unlinked = true;
if (rc != 0)
{
exfat_flush_node(ef, parent);
int exfat_unlink(struct exfat* ef, struct exfat_node* node)
{
- if (node->flags & EXFAT_ATTRIB_DIR)
+ if (node->attrib & EXFAT_ATTRIB_DIR)
return -EISDIR;
return delete(ef, node);
}
{
int rc;
- if (!(node->flags & EXFAT_ATTRIB_DIR))
+ if (!(node->attrib & EXFAT_ATTRIB_DIR))
return -ENOTDIR;
/* check that directory is empty */
rc = exfat_cache_directory(ef, node);
return 0;
}
-static int write_entry(struct exfat* ef, struct exfat_node* dir,
+static int commit_entry(struct exfat* ef, struct exfat_node* dir,
const le16_t* name, cluster_t cluster, off_t offset, uint16_t attrib)
{
struct exfat_node* node;
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.name_hash = exfat_calc_name_hash(ef, node->name, name_length);
meta2.start_cluster = cpu_to_le32(EXFAT_CLUSTER_FREE);
meta1.checksum = exfat_calc_checksum(&meta1, &meta2, node->name);
exfat_put_node(ef, dir);
return rc;
}
- rc = write_entry(ef, dir, name, cluster, offset, attrib);
+ rc = commit_entry(ef, dir, name, cluster, offset, attrib);
if (rc != 0)
{
exfat_put_node(ef, dir);
return -EIO;
}
meta1.continuations = 1 + name_entries;
- meta2.name_hash = exfat_calc_name_hash(ef, name);
+ meta2.name_hash = exfat_calc_name_hash(ef, name, name_length);
meta2.name_length = name_length;
meta1.checksum = exfat_calc_checksum(&meta1, &meta2, name);
}
/* check that target is not a subdirectory of the source */
- if (node->flags & EXFAT_ATTRIB_DIR)
+ if (node->attrib & EXFAT_ATTRIB_DIR)
{
struct exfat_node* p;
/* remove target if it's not the same node as source */
if (existing != node)
{
- if (existing->flags & EXFAT_ATTRIB_DIR)
+ if (existing->attrib & EXFAT_ATTRIB_DIR)
{
- if (node->flags & EXFAT_ATTRIB_DIR)
+ if (node->attrib & EXFAT_ATTRIB_DIR)
rc = exfat_rmdir(ef, existing);
else
rc = -ENOTDIR;
}
else
{
- if (!(node->flags & EXFAT_ATTRIB_DIR))
+ if (!(node->attrib & EXFAT_ATTRIB_DIR))
rc = exfat_unlink(ef, existing);
else
rc = -EISDIR;
{
node->atime = tv[0].tv_sec;
node->mtime = tv[1].tv_sec;
- node->flags |= EXFAT_ATTRIB_DIRTY;
+ node->is_dirty = true;
}
void exfat_update_atime(struct exfat_node* node)
{
node->atime = time(NULL);
- node->flags |= EXFAT_ATTRIB_DIRTY;
+ node->is_dirty = true;
}
void exfat_update_mtime(struct exfat_node* node)
{
node->mtime = time(NULL);
- node->flags |= EXFAT_ATTRIB_DIRTY;
+ node->is_dirty = true;
}
const char* exfat_get_label(struct exfat* ef)
struct exfat_entry_label entry;
memset(label_utf16, 0, sizeof(label_utf16));
- rc = utf8_to_utf16(label_utf16, label, EXFAT_ENAME_MAX, strlen(label));
+ rc = utf8_to_utf16(label_utf16, label, EXFAT_ENAME_MAX + 1, strlen(label));
if (rc != 0)
return rc;
OSDN Git Service
