OSDN Git Service
(root)
/
android-x86
/
external-exfat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use bool type.
[android-x86/external-exfat.git]
/
libexfat
/
mount.c
diff --git
a/libexfat/mount.c
b/libexfat/mount.c
index
295d455
..
afdcb54
100644
(file)
--- a/
libexfat/mount.c
+++ b/
libexfat/mount.c
@@
-2,7
+2,7
@@
mount.c (22.10.09)
exFAT file system implementation library.
mount.c (22.10.09)
exFAT file system implementation library.
- Copyright (C) 20
09, 2010
Andrew Nayenko
+ Copyright (C) 20
10-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
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
@@
-24,8
+24,6
@@
#include <errno.h>
#include <unistd.h>
#include <sys/types.h>
#include <errno.h>
#include <unistd.h>
#include <sys/types.h>
-#define _XOPEN_SOURCE /* for tzset() in Linux */
-#include <time.h>
static uint64_t rootdir_size(const struct exfat* ef)
{
static uint64_t rootdir_size(const struct exfat* ef)
{
@@
-63,7
+61,7
@@
static int get_int_option(const char* options, const char* option_name,
return strtol(p, NULL, base);
}
return strtol(p, NULL, base);
}
-static
int
match_option(const char* options, const char* option_name)
+static
bool
match_option(const char* options, const char* option_name)
{
const char* p;
size_t length = strlen(option_name);
{
const char* p;
size_t length = strlen(option_name);
@@
-71,8
+69,8
@@
static int match_option(const char* options, const char* option_name)
for (p = strstr(options, option_name); p; p = strstr(p + 1, option_name))
if ((p == options || p[-1] == ',') &&
(p[length] == ',' || p[length] == '\0'))
for (p = strstr(options, option_name); p; p = strstr(p + 1, option_name))
if ((p == options || p[-1] == ',') &&
(p[length] == ',' || p[length] == '\0'))
- return
1
;
- return
0
;
+ return
true
;
+ return
false
;
}
static void parse_options(struct exfat* ef, const char* options)
}
static void parse_options(struct exfat* ef, const char* options)
@@
-88,24
+86,24
@@
static void parse_options(struct exfat* ef, const char* options)
ef->uid = get_int_option(options, "uid", 10, geteuid());
ef->gid = get_int_option(options, "gid", 10, getegid());
ef->uid = get_int_option(options, "uid", 10, geteuid());
ef->gid = get_int_option(options, "gid", 10, getegid());
- ef->ro = match_option(options, "ro");
ef->noatime = match_option(options, "noatime");
}
ef->noatime = match_option(options, "noatime");
}
-static int verify_vbr_checksum(void* sector, off_t sector_size, int fd)
+static int verify_vbr_checksum(struct exfat_dev* dev, void* sector,
+ off_t sector_size)
{
uint32_t vbr_checksum;
int i;
{
uint32_t vbr_checksum;
int i;
- exfat_
read_raw(sector, sector_size, 0, fd
);
+ exfat_
pread(dev, sector, sector_size, 0
);
vbr_checksum = exfat_vbr_start_checksum(sector, sector_size);
for (i = 1; i < 11; i++)
{
vbr_checksum = exfat_vbr_start_checksum(sector, sector_size);
for (i = 1; i < 11; i++)
{
- exfat_
read_raw(sector, sector_size, i * sector_size, fd
);
+ exfat_
pread(dev, sector, sector_size, i * sector_size
);
vbr_checksum = exfat_vbr_add_checksum(sector, sector_size,
vbr_checksum);
}
vbr_checksum = exfat_vbr_add_checksum(sector, sector_size,
vbr_checksum);
}
- exfat_
read_raw(sector, sector_size, i * sector_size, fd
);
+ exfat_
pread(dev, sector, sector_size, i * sector_size
);
for (i = 0; i < sector_size / sizeof(vbr_checksum); i++)
if (le32_to_cpu(((const le32_t*) sector)[i]) != vbr_checksum)
{
for (i = 0; i < sector_size / sizeof(vbr_checksum); i++)
if (le32_to_cpu(((const le32_t*) sector)[i]) != vbr_checksum)
{
@@
-118,13
+116,8
@@
static int verify_vbr_checksum(void* sector, off_t sector_size, int fd)
static int commit_super_block(const struct exfat* ef)
{
static int commit_super_block(const struct exfat* ef)
{
- exfat_write_raw(ef->sb, sizeof(struct exfat_super_block), 0, ef->fd);
- if (fsync(ef->fd) < 0)
- {
- exfat_error("fsync failed");
- return 1;
- }
- return 0;
+ exfat_pwrite(ef->dev, ef->sb, sizeof(struct exfat_super_block), 0);
+ return exfat_fsync(ef->dev);
}
static int prepare_super_block(const struct exfat* ef)
}
static int prepare_super_block(const struct exfat* ef)
@@
-143,44
+136,50
@@
static int prepare_super_block(const struct exfat* ef)
int exfat_mount(struct exfat* ef, const char* spec, const char* options)
{
int rc;
int exfat_mount(struct exfat* ef, const char* spec, const char* options)
{
int rc;
+ enum exfat_mode mode;
- tzset();
+
exfat_
tzset();
memset(ef, 0, sizeof(struct exfat));
parse_options(ef, options);
memset(ef, 0, sizeof(struct exfat));
parse_options(ef, options);
- ef->fd = exfat_open(spec, ef->ro);
- if (ef->fd < 0)
+ if (match_option(options, "ro"))
+ mode = EXFAT_MODE_RO;
+ else if (match_option(options, "ro_fallback"))
+ mode = EXFAT_MODE_ANY;
+ else
+ mode = EXFAT_MODE_RW;
+ ef->dev = exfat_open(spec, mode);
+ if (ef->dev == NULL)
+ return -EIO;
+ if (exfat_mode(ef->dev) == EXFAT_MODE_RO)
{
{
- if (ef->ro || !match_option(options, "ro_fallback"))
- return -EIO;
- ef->fd = exfat_open(spec, 1);
- if (ef->fd < 0)
- return -EIO;
- exfat_warn("device is write-protected, mounting read-only");
- ef->ro_fallback = ef->ro = 1;
+ if (mode == EXFAT_MODE_ANY)
+ ef->ro = -1;
+ else
+ ef->ro = 1;
}
ef->sb = malloc(sizeof(struct exfat_super_block));
if (ef->sb == NULL)
{
}
ef->sb = malloc(sizeof(struct exfat_super_block));
if (ef->sb == NULL)
{
-
close(ef->fd
);
+
exfat_close(ef->dev
);
exfat_error("failed to allocate memory for the super block");
return -ENOMEM;
}
memset(ef->sb, 0, sizeof(struct exfat_super_block));
exfat_error("failed to allocate memory for the super block");
return -ENOMEM;
}
memset(ef->sb, 0, sizeof(struct exfat_super_block));
- exfat_
read_raw(ef->sb, sizeof(struct exfat_super_block), 0, ef->fd
);
+ exfat_
pread(ef->dev, ef->sb, sizeof(struct exfat_super_block), 0
);
if (memcmp(ef->sb->oem_name, "EXFAT ", 8) != 0)
{
if (memcmp(ef->sb->oem_name, "EXFAT ", 8) != 0)
{
-
close(ef->fd
);
+
exfat_close(ef->dev
);
free(ef->sb);
exfat_error("exFAT file system is not found");
return -EIO;
}
if (ef->sb->version.major != 1 || ef->sb->version.minor != 0)
{
free(ef->sb);
exfat_error("exFAT file system is not found");
return -EIO;
}
if (ef->sb->version.major != 1 || ef->sb->version.minor != 0)
{
-
close(ef->fd
);
+
exfat_close(ef->dev
);
exfat_error("unsupported exFAT version: %hhu.%hhu",
ef->sb->version.major, ef->sb->version.minor);
free(ef->sb);
exfat_error("unsupported exFAT version: %hhu.%hhu",
ef->sb->version.major, ef->sb->version.minor);
free(ef->sb);
@@
-188,7
+187,7
@@
int exfat_mount(struct exfat* ef, const char* spec, const char* options)
}
if (ef->sb->fat_count != 1)
{
}
if (ef->sb->fat_count != 1)
{
-
close(ef->fd
);
+
exfat_close(ef->dev
);
free(ef->sb);
exfat_error("unsupported FAT count: %hhu", ef->sb->fat_count);
return -EIO;
free(ef->sb);
exfat_error("unsupported FAT count: %hhu", ef->sb->fat_count);
return -EIO;
@@
-196,7
+195,7
@@
int exfat_mount(struct exfat* ef, const char* spec, const char* options)
/* officially exFAT supports cluster size up to 32 MB */
if ((int) ef->sb->sector_bits + (int) ef->sb->spc_bits > 25)
{
/* officially exFAT supports cluster size up to 32 MB */
if ((int) ef->sb->sector_bits + (int) ef->sb->spc_bits > 25)
{
-
close(ef->fd
);
+
exfat_close(ef->dev
);
free(ef->sb);
exfat_error("too big cluster size: 2^%d",
(int) ef->sb->sector_bits + (int) ef->sb->spc_bits);
free(ef->sb);
exfat_error("too big cluster size: 2^%d",
(int) ef->sb->sector_bits + (int) ef->sb->spc_bits);
@@
-206,17
+205,17
@@
int exfat_mount(struct exfat* ef, const char* spec, const char* options)
ef->zero_cluster = malloc(CLUSTER_SIZE(*ef->sb));
if (ef->zero_cluster == NULL)
{
ef->zero_cluster = malloc(CLUSTER_SIZE(*ef->sb));
if (ef->zero_cluster == NULL)
{
-
close(ef->fd
);
+
exfat_close(ef->dev
);
free(ef->sb);
exfat_error("failed to allocate zero sector");
return -ENOMEM;
}
/* use zero_cluster as a temporary buffer for VBR checksum verification */
free(ef->sb);
exfat_error("failed to allocate zero sector");
return -ENOMEM;
}
/* use zero_cluster as a temporary buffer for VBR checksum verification */
- if (verify_vbr_checksum(ef->
zero_cluster, SECTOR_SIZE(*ef->sb)
,
-
ef->fd
) != 0)
+ if (verify_vbr_checksum(ef->
dev, ef->zero_cluster
,
+
SECTOR_SIZE(*ef->sb)
) != 0)
{
free(ef->zero_cluster);
{
free(ef->zero_cluster);
-
close(ef->fd
);
+
exfat_close(ef->dev
);
free(ef->sb);
return -EIO;
}
free(ef->sb);
return -EIO;
}
@@
-226,7
+225,7
@@
int exfat_mount(struct exfat* ef, const char* spec, const char* options)
if (ef->root == NULL)
{
free(ef->zero_cluster);
if (ef->root == NULL)
{
free(ef->zero_cluster);
-
close(ef->fd
);
+
exfat_close(ef->dev
);
free(ef->sb);
exfat_error("failed to allocate root node");
return -ENOMEM;
free(ef->sb);
exfat_error("failed to allocate root node");
return -ENOMEM;
@@
-267,7
+266,7
@@
error:
exfat_reset_cache(ef);
free(ef->root);
free(ef->zero_cluster);
exfat_reset_cache(ef);
free(ef->root);
free(ef->zero_cluster);
-
close(ef->fd
);
+
exfat_close(ef->dev
);
free(ef->sb);
return -EIO;
}
free(ef->sb);
return -EIO;
}
@@
-301,9
+300,8
@@
void exfat_unmount(struct exfat* ef)
free(ef->root);
ef->root = NULL;
finalize_super_block(ef);
free(ef->root);
ef->root = NULL;
finalize_super_block(ef);
- if (close(ef->fd) < 0) /* close descriptor immediately after fsync */
- exfat_error("close failed");
- ef->fd = 0;
+ exfat_close(ef->dev); /* close descriptor immediately after fsync */
+ ef->dev = NULL;
free(ef->zero_cluster);
ef->zero_cluster = NULL;
free(ef->cmap.chunk);
free(ef->zero_cluster);
ef->zero_cluster = NULL;
free(ef->cmap.chunk);