1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
--- 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;
}
|
