averello/sparsebundlefs-mirror
1
0
Fork 0
mirror of https://github.com/torarnv/sparsebundlefs.git synced 2026-03-03 18:28:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Verify bundle and mount point paths in sparsebundle_opt_proc

Browse Source
This commit is contained in:
Tor Arne Vestbø
2013-07-29 23:02:57 +02:00
committed by Tor Arne Vestbø
parent 40e55df463
commit bc83f462d0
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sparsebundlefs.cpp
View File

@@ -413,14 +413,19 @@ static int sparsebundle_opt_proc(void *data, const char *arg, int key, struct fu
case SPARSEBUNDLE_OPT_DEBUG:
setlogmask(LOG_UPTO(LOG_DEBUG));
return SPARSEBUNDLE_OPT_HANDLED;
case FUSE_OPT_KEY_NONOPT:
sparsebundle_t *sparsebundle = static_cast<sparsebundle_t *>(data);
if (!sparsebundle->path) {
sparsebundle->path = strdup(arg);
sparsebundle->path = realpath(arg, 0);
if (!sparsebundle->path)
sparsebundle_fatal_error("bad sparse-bundle `%s'", arg);
return SPARSEBUNDLE_OPT_HANDLED;
} else if (!sparsebundle->mountpoint) {
sparsebundle->mountpoint = strdup(arg);
sparsebundle->mountpoint = realpath(arg, 0);
if (!sparsebundle->mountpoint)
sparsebundle_fatal_error("bad mount point `%s'", arg);
fuse_opt_add_arg(outargs, sparsebundle->mountpoint);
return SPARSEBUNDLE_OPT_HANDLED;
}
@@ -456,18 +461,9 @@ int main(int argc, char **argv)
fuse_opt_parse(&args, &sparsebundle, sparsebundle_options, sparsebundle_opt_proc);
fuse_opt_add_arg(&args, "-oro"); // Force read-only mount
if (!sparsebundle.path)
if (!sparsebundle.path || !sparsebundle.mountpoint)
return sparsebundle_show_usage(argv[0]);
char *abs_path = realpath(sparsebundle.path, 0);
if (!abs_path) {
perror("Could not resolve absolute path");
return EXIT_FAILURE;
}
free(sparsebundle.path);
sparsebundle.path = abs_path;
char *plist_path;
if (asprintf(&plist_path, "%s/Info.plist", sparsebundle.path) == -1)
sparsebundle_fatal_error("could not resolve Info.plist path");