mirror of
https://git.freebsd.org/ports.git
synced 2025-04-29 10:06:40 -04:00
6e2da9672f
The filesystems category houses file systems and file system utilities. It is added mainly to turn the sysutils/fusefs-* pseudo-category into a proper one, but is also useful for the sundry of other file systems related ports found in the tree. Ports that seem like they belong there are moved to the new category. Two ports, sysutils/fusefs-funionfs and sysutils/fusefs-fusepak are not moved as they currently don't fetch and don't have TIMESTAMP set in their distinfo, but that is required to be able to push a rename of the port by the pre-receive hook. Approved by: portmgr (rene) Reviewed by: mat Pull Request: https://github.com/freebsd/freebsd-ports/pull/302 PR: 281988
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;
|
|
}
|