aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGravatar Nikolaus Rath <Nikolaus@rath.org>2017-07-07 15:25:41 +0200
committerGravatar Nikolaus Rath <Nikolaus@rath.org>2017-07-08 12:48:08 +0200
commite870a0427adb50a64dc8bcbacfacb089872c6908 (patch)
tree454e310cc66d048ee2e45493b6abaafcb80d1749 /include
parent79b446d22ce8cfb387549bef2a0ddcaf6fbb3331 (diff)
Added public fuse_lib_help(), bumped minor version
Diffstat (limited to 'include')
-rw-r--r--include/fuse.h19
-rw-r--r--include/fuse_common.h2
-rw-r--r--include/fuse_lowlevel.h2
3 files changed, 21 insertions, 2 deletions
diff --git a/include/fuse.h b/include/fuse.h
index 0c5741f..f4ac670 100644
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -795,6 +795,19 @@ struct fuse_context {
* ----------------------------------------------------------- */
/**
+ * Print available options (high- and low-level) to stdout. This is
+ * not an exhaustive list, but includes only those options that may be
+ * of interest to an end-user of a file system.
+ *
+ * The function looks at the argument vector only to determine if
+ * there are additional modules to be loaded (module=foo option),
+ * and attempts to call their help functions as well.
+ *
+ * @param args the argument vector.
+ */
+void fuse_lib_help(struct fuse_args *args);
+
+/**
* Create a new FUSE filesystem.
*
* This function accepts most file-system independent mount options
@@ -821,8 +834,14 @@ struct fuse_context {
* `struct fuse_operations.init` handler.
* @return the created FUSE handle
*/
+#if FUSE_USE_VERSION == 30
+#define fuse_new(args, op, size, data) fuse_new_30(args, op, size, data)
+#else
struct fuse *fuse_new(struct fuse_args *args, const struct fuse_operations *op,
size_t op_size, void *private_data);
+#endif
+struct fuse *fuse_new_30(struct fuse_args *args, const struct fuse_operations *op,
+ size_t op_size, void *private_data);
/**
* Mount a FUSE file system.
diff --git a/include/fuse_common.h b/include/fuse_common.h
index 8bacec5..ecaa906 100644
--- a/include/fuse_common.h
+++ b/include/fuse_common.h
@@ -22,7 +22,7 @@
#define FUSE_MAJOR_VERSION 3
/** Minor version of FUSE library interface */
-#define FUSE_MINOR_VERSION 0
+#define FUSE_MINOR_VERSION 1
#define FUSE_MAKE_VERSION(maj, min) ((maj) * 10 + (min))
#define FUSE_VERSION FUSE_MAKE_VERSION(FUSE_MAJOR_VERSION, FUSE_MINOR_VERSION)
diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
index 7a3036d..8e036f5 100644
--- a/include/fuse_lowlevel.h
+++ b/include/fuse_lowlevel.h
@@ -14,7 +14,7 @@
* Low level API
*
* IMPORTANT: you should define FUSE_USE_VERSION before including this
- * header. To use the newest API define it to 30 (recommended for any
+ * header. To use the newest API define it to 31 (recommended for any
* new application).
*/