exFAT file system implementation library.
Free exFAT implementation.
- Copyright (C) 2010-2017 Andrew Nayenko
+ Copyright (C) 2010-2018 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
size = exfat_generic_pread(ef, dir, entries,
sizeof(struct exfat_entry[n]), offset);
- if (size == sizeof(struct exfat_entry[n]))
+ if (size == (ssize_t) sizeof(struct exfat_entry) * n)
return 0; /* success */
if (size == 0)
return -ENOENT;
size = exfat_generic_pwrite(ef, dir, entries,
sizeof(struct exfat_entry[n]), offset);
- if (size == sizeof(struct exfat_entry[n]))
+ if (size == (ssize_t) sizeof(struct exfat_entry) * n)
return 0; /* success */
if (size < 0)
return -EIO;
node->attrib = le16_to_cpu(meta1->attrib);
node->continuations = meta1->continuations;
node->mtime = exfat_exfat2unix(meta1->mdate, meta1->mtime,
- meta1->mtime_cs);
+ meta1->mtime_cs, meta1->mtime_tzo);
/* there is no centiseconds field for atime */
- node->atime = exfat_exfat2unix(meta1->adate, meta1->atime, 0);
+ node->atime = exfat_exfat2unix(meta1->adate, meta1->atime,
+ 0, meta1->atime_tzo);
}
static void init_node_meta2(struct exfat_node* node,
exfat_get_name(node, buffer);
exfat_error("'%s' has invalid checksum (%#hx != %#hx)", buffer,
le16_to_cpu(actual_checksum), le16_to_cpu(meta1->checksum));
- ret = false;
+ if (!EXFAT_REPAIR(invalid_node_checksum, ef, node))
+ ret = false;
}
/*
const struct exfat_entry_label* label;
uint64_t upcase_size = 0;
le16_t* upcase_comp = NULL;
+ le16_t label_name[EXFAT_ENAME_MAX];
for (;;)
{
exfat_error("too long label (%hhu chars)", label->length);
return -EIO;
}
- if (utf16_to_utf8(ef->label, label->name,
+ /* copy to a temporary buffer to avoid unaligned access to a
+ packed member */
+ memcpy(label_name, label->name, sizeof(label_name));
+ if (exfat_utf16_to_utf8(ef->label, label_name,
sizeof(ef->label), EXFAT_ENAME_MAX) != 0)
return -EIO;
break;
break; /* deleted entry, ignore it */
exfat_error("unknown entry type %#hhx", entry.type);
- return -EIO;
+ if (!EXFAT_REPAIR(unknown_entry, ef, parent, &entry, *offset))
+ return -EIO;
}
*offset += sizeof(entry);
}
struct exfat_entry_meta1* meta1 = (struct exfat_entry_meta1*) &entries[0];
struct exfat_entry_meta2* meta2 = (struct exfat_entry_meta2*) &entries[1];
int rc;
+ le16_t edate, etime;
if (!node->is_dirty)
return 0; /* no need to flush */
return -EIO;
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);
+ exfat_unix2exfat(node->mtime, &edate, &etime,
+ &meta1->mtime_cs, &meta1->mtime_tzo);
+ meta1->mdate = edate;
+ meta1->mtime = etime;
+ exfat_unix2exfat(node->atime, &edate, &etime,
+ NULL, &meta1->atime_tzo);
+ meta1->adate = edate;
+ meta1->atime = etime;
meta2->size = meta2->valid_size = cpu_to_le64(node->size);
meta2->start_cluster = cpu_to_le32(node->start_cluster);
meta2->flags = EXFAT_FLAG_ALWAYS1;
/* two subentries with meta info */
entries += 2;
/* subentries with file name */
- entries += DIV_ROUND_UP(utf16_length(last_node->name),
+ entries += DIV_ROUND_UP(exfat_utf16_length(last_node->name),
EXFAT_ENAME_MAX);
}
{
struct exfat_entry entries[n];
int rc;
- size_t i;
+ int i;
/* Root directory contains entries, that don't have any nodes associated
with them (clusters bitmap, upper case table, label). We need to be
return -ENOMEM;
}
for (p = dir->child; p != NULL; p = p->next)
- for (i = 0; i < 1 + p->continuations; i++)
+ for (i = 0; i < 1u + p->continuations; i++)
BMAP_SET(dmap, p->entry_offset / sizeof(struct exfat_entry) + i);
/* find a slot in the directory entries bitmap */
if (contiguous++ == 0)
*offset = (off_t) i * sizeof(struct exfat_entry);
if (contiguous == n)
+ {
+ int rc;
+
/* suitable slot is found, check that it's not occupied */
- switch (check_slot(ef, dir, *offset, n))
+ rc = check_slot(ef, dir, *offset, n);
+ if (rc == -EINVAL)
{
- case 0:
- free(dmap);
- return 0;
- case -EIO:
- free(dmap);
- return -EIO;
- case -EINVAL:
- /* slot is occupied, continue searching */
+ /* slot at (i-n) is occupied, go back and check (i-n+1) */
+ i -= contiguous - 1;
contiguous = 0;
- break;
}
+ else
+ {
+ /* slot is free or an error occurred */
+ free(dmap);
+ return rc;
+ }
+ }
}
else
contiguous = 0;
const le16_t* name, off_t offset, uint16_t attrib)
{
struct exfat_node* node;
- const size_t name_length = utf16_length(name);
+ const size_t name_length = exfat_utf16_length(name);
const int name_entries = DIV_ROUND_UP(name_length, EXFAT_ENAME_MAX);
struct exfat_entry entries[2 + name_entries];
struct exfat_entry_meta1* meta1 = (struct exfat_entry_meta1*) &entries[0];
struct exfat_entry_meta2* meta2 = (struct exfat_entry_meta2*) &entries[1];
int i;
int rc;
+ le16_t edate, etime;
memset(entries, 0, sizeof(struct exfat_entry[2]));
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;
+ exfat_unix2exfat(time(NULL), &edate, &etime,
+ &meta1->crtime_cs, &meta1->crtime_tzo);
+ meta1->adate = meta1->mdate = meta1->crdate = edate;
+ meta1->atime = meta1->mtime = meta1->crtime = etime;
meta1->mtime_cs = meta1->crtime_cs; /* there is no atime_cs */
+ meta1->atime_tzo = meta1->mtime_tzo = meta1->crtime_tzo;
meta2->type = EXFAT_ENTRY_FILE_INFO;
meta2->flags = EXFAT_FLAG_ALWAYS1;
}
rc = find_slot(ef, dir, &offset,
- 2 + DIV_ROUND_UP(utf16_length(name), EXFAT_ENAME_MAX));
+ 2 + DIV_ROUND_UP(exfat_utf16_length(name), EXFAT_ENAME_MAX));
if (rc != 0)
{
exfat_put_node(ef, dir);
static int rename_entry(struct exfat* ef, struct exfat_node* dir,
struct exfat_node* node, const le16_t* name, off_t new_offset)
{
- const size_t name_length = utf16_length(name);
+ const size_t name_length = exfat_utf16_length(name);
const int name_entries = DIV_ROUND_UP(name_length, EXFAT_ENAME_MAX);
struct exfat_entry entries[2 + name_entries];
struct exfat_entry_meta1* meta1 = (struct exfat_entry_meta1*) &entries[0];
}
rc = find_slot(ef, dir, &offset,
- 2 + DIV_ROUND_UP(utf16_length(name), EXFAT_ENAME_MAX));
+ 2 + DIV_ROUND_UP(exfat_utf16_length(name), EXFAT_ENAME_MAX));
if (rc != 0)
{
exfat_put_node(ef, dir);
struct exfat_entry_label entry;
memset(label_utf16, 0, sizeof(label_utf16));
- rc = utf8_to_utf16(label_utf16, label, EXFAT_ENAME_MAX + 1, strlen(label));
+ rc = exfat_utf8_to_utf16(label_utf16, label, EXFAT_ENAME_MAX + 1,
+ strlen(label));
if (rc != 0)
return rc;
return rc;
entry.type = EXFAT_ENTRY_LABEL;
- entry.length = utf16_length(label_utf16);
+ entry.length = exfat_utf16_length(label_utf16);
memcpy(entry.name, label_utf16, sizeof(entry.name));
if (entry.length == 0)
entry.type ^= EXFAT_ENTRY_VALID;
projects / sven / fuse-exfat.git / blobdiff