mirror of
https://git.freebsd.org/ports.git
synced 2025-05-16 09:11:50 -04:00
3119399f72
- Pass maintainership to submitter The SourceForge mirror has gone due to the project migrating to GitHub. The only changes made to the port were to build the package from the sources now provided from the GitHub releases. Due to slight changes to the build process (adding missing dependency declarations, generating a configure script ourselves, new master site), and due to the fact there are many packages dependent on this port, the PORTREVISION has been incremented just in case there are any incompatibilities even though the version has allegedly not been changed. PR: 205620 Submitted by: Brendan Molloy
72 lines
2 KiB
C
72 lines
2 KiB
C
--- lib/helper.c.orig 2015-05-22 09:24:02 UTC
|
|
+++ lib/helper.c
|
|
@@ -31,7 +31,7 @@ enum {
|
|
struct helper_opts {
|
|
int singlethread;
|
|
int foreground;
|
|
- int nodefault_subtype;
|
|
+ int fsname;
|
|
char *mountpoint;
|
|
};
|
|
|
|
@@ -42,8 +42,7 @@ static const struct fuse_opt fuse_helper
|
|
FUSE_HELPER_OPT("debug", foreground),
|
|
FUSE_HELPER_OPT("-f", foreground),
|
|
FUSE_HELPER_OPT("-s", singlethread),
|
|
- FUSE_HELPER_OPT("fsname=", nodefault_subtype),
|
|
- FUSE_HELPER_OPT("subtype=", nodefault_subtype),
|
|
+ FUSE_HELPER_OPT("fsname=", fsname),
|
|
|
|
FUSE_OPT_KEY("-h", KEY_HELP),
|
|
FUSE_OPT_KEY("--help", KEY_HELP),
|
|
@@ -53,7 +52,6 @@ static const struct fuse_opt fuse_helper
|
|
FUSE_OPT_KEY("-d", FUSE_OPT_KEY_KEEP),
|
|
FUSE_OPT_KEY("debug", FUSE_OPT_KEY_KEEP),
|
|
FUSE_OPT_KEY("fsname=", FUSE_OPT_KEY_KEEP),
|
|
- FUSE_OPT_KEY("subtype=", FUSE_OPT_KEY_KEEP),
|
|
FUSE_OPT_END
|
|
};
|
|
|
|
@@ -123,24 +121,24 @@ static int fuse_helper_opt_proc(void *da
|
|
}
|
|
}
|
|
|
|
-static int add_default_subtype(const char *progname, struct fuse_args *args)
|
|
+static int add_default_fsname(const char *progname, struct fuse_args *args)
|
|
{
|
|
int res;
|
|
- char *subtype_opt;
|
|
+ char *fsname_opt;
|
|
const char *basename = strrchr(progname, '/');
|
|
if (basename == NULL)
|
|
basename = progname;
|
|
else if (basename[1] != '\0')
|
|
basename++;
|
|
|
|
- subtype_opt = (char *) malloc(strlen(basename) + 64);
|
|
- if (subtype_opt == NULL) {
|
|
+ fsname_opt = (char *) malloc(strlen(basename) + 64);
|
|
+ if (fsname_opt == NULL) {
|
|
fprintf(stderr, "fuse: memory allocation failed\n");
|
|
return -1;
|
|
}
|
|
- sprintf(subtype_opt, "-osubtype=%s", basename);
|
|
- res = fuse_opt_add_arg(args, subtype_opt);
|
|
- free(subtype_opt);
|
|
+ sprintf(fsname_opt, "-ofsname=%s", basename);
|
|
+ res = fuse_opt_add_arg(args, fsname_opt);
|
|
+ free(fsname_opt);
|
|
return res;
|
|
}
|
|
|
|
@@ -156,8 +154,8 @@ int fuse_parse_cmdline(struct fuse_args
|
|
if (res == -1)
|
|
return -1;
|
|
|
|
- if (!hopts.nodefault_subtype) {
|
|
- res = add_default_subtype(args->argv[0], args);
|
|
+ if (!hopts.fsname) {
|
|
+ res = add_default_fsname(args->argv[0], args);
|
|
if (res == -1)
|
|
goto err;
|
|
}
|