summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/libfuse/Makefile4
-rw-r--r--lib/libfuse/fuse_daemonize.36
-rw-r--r--lib/libfuse/fuse_main.38
-rw-r--r--lib/libfuse/fuse_parse_cmdline.3 (renamed from lib/libfuse/fuse_parse_cmd_line.3)24
-rw-r--r--lib/libfuse/fuse_setup.38
5 files changed, 25 insertions, 25 deletions
diff --git a/lib/libfuse/Makefile b/lib/libfuse/Makefile
index 8edfae9adcb..92cf65b8fc9 100644
--- a/lib/libfuse/Makefile
+++ b/lib/libfuse/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2018/08/03 23:32:04 helg Exp $
+# $OpenBSD: Makefile,v 1.17 2018/11/28 21:19:11 mpi Exp $
LIB= fuse
MAN= fuse_chan_fd.3 fuse_daemonize.3 fuse_destroy.3 fuse_get_context.3 \
fuse_get_session.3 fuse_loop.3 fuse_main.3 fuse_mount.3 fuse_new.3 \
- fuse_opt.3 fuse_parse_cmd_line.3 fuse_set_signal_handlers.3 \
+ fuse_opt.3 fuse_parse_cmdline.3 fuse_set_signal_handlers.3 \
fuse_setup.3 fuse_teardown.3 fuse_version.3
CFLAGS+= -Wall -Wshadow -Wmissing-prototypes
diff --git a/lib/libfuse/fuse_daemonize.3 b/lib/libfuse/fuse_daemonize.3
index d71ef4c353d..dc30a15e232 100644
--- a/lib/libfuse/fuse_daemonize.3
+++ b/lib/libfuse/fuse_daemonize.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fuse_daemonize.3,v 1.2 2018/07/08 06:17:10 jmc Exp $
+.\" $OpenBSD: fuse_daemonize.3,v 1.3 2018/11/28 21:19:11 mpi Exp $
.\"
.\" Copyright (c) 2018 Helg Bredow <helg@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: July 8 2018 $
+.Dd $Mdocdate: November 28 2018 $
.Dt FUSE_DAEMONIZE 3
.Os
.Sh NAME
@@ -45,7 +45,7 @@ can fail for the same reasons as
.Xr daemon 3 .
.Sh SEE ALSO
.Xr daemon 3 ,
-.Xr fuse_parse_cmd_line 3
+.Xr fuse_parse_cmdline 3
.Sh STANDARDS
The
.Fn fuse_daemonize
diff --git a/lib/libfuse/fuse_main.3 b/lib/libfuse/fuse_main.3
index 6b449379da8..acf411544c4 100644
--- a/lib/libfuse/fuse_main.3
+++ b/lib/libfuse/fuse_main.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fuse_main.3,v 1.5 2018/07/08 06:17:10 jmc Exp $
+.\" $OpenBSD: fuse_main.3,v 1.6 2018/11/28 21:19:11 mpi Exp $
.\"
.\" Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
.\" Copyright (c) 2018 Helg Bredow <helg@openbsd.org>
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: July 8 2018 $
+.Dd $Mdocdate: November 28 2018 $
.Dt FUSE_MAIN 3
.Os
.Sh NAME
@@ -43,7 +43,7 @@ must at a minimum specify the directory on which the file system is to
be mounted.
The other arguments can be custom arguments specific to the
file system or those supported by
-.Xr fuse_parse_cmd_line 3 ,
+.Xr fuse_parse_cmdline 3 ,
.Xr fuse_new 3
and
.Xr fuse_mount 3 .
@@ -127,7 +127,7 @@ main(int ac, char **av)
.Xr fuse_loop 3 ,
.Xr fuse_mount 3 ,
.Xr fuse_new 3 ,
-.Xr fuse_parse_cmd_line 3 ,
+.Xr fuse_parse_cmdline 3 ,
.Xr fuse_setup 3 ,
.Xr fuse 4
.Sh STANDARDS
diff --git a/lib/libfuse/fuse_parse_cmd_line.3 b/lib/libfuse/fuse_parse_cmdline.3
index 4679703cb23..562012f125c 100644
--- a/lib/libfuse/fuse_parse_cmd_line.3
+++ b/lib/libfuse/fuse_parse_cmdline.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fuse_parse_cmd_line.3,v 1.2 2018/07/08 06:17:10 jmc Exp $
+.\" $OpenBSD: fuse_parse_cmdline.3,v 1.1 2018/11/28 21:19:11 mpi Exp $
.\"
.\" Copyright (c) 2018 Helg Bredow <helg.bredow@openbsd.org>
.\"
@@ -14,26 +14,26 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: July 8 2018 $
-.Dt FUSE_PARSE_CMD_LINE 3
+.Dd $Mdocdate: November 28 2018 $
+.Dt FUSE_PARSE_CMDLINE 3
.Os
.Sh NAME
-.Nm fuse_parse_cmd_line
+.Nm fuse_parse_cmdline
.Nd FUSE helper function to parse command line arguments
.Sh SYNOPSIS
.In fuse.h
.Ft int
-.Fn fuse_parse_cmd_line "struct fuse_args *args" "char **mp" \
+.Fn fuse_parse_cmdline "struct fuse_args *args" "char **mp" \
"int *mt" "int *fg"
.Sh DESCRIPTION
-.Fn fuse_parse_cmd_line
+.Fn fuse_parse_cmdline
is a helper function to parse standard FUSE arguments.
.Fa args
can be constructed using the
.Xr FUSE_ARGS_INIT 3
macro.
.Pp
-.Fn fuse_parse_cmd_line
+.Fn fuse_parse_cmdline
supports the following arguments.
.Bl -tag -width Ds
.It Fl d , Fl odebug
@@ -49,7 +49,7 @@ This flag indicates that the file system
should not detach from the controlling terminal and run in the foreground.
.It Fl h , Fl -help , Fl ho
Print usage information for the options supported by
-.Fn fuse_parse_cmd_line .
+.Fn fuse_parse_cmdline .
.It Fl s
If this is specified then
.Fa mt
@@ -65,13 +65,13 @@ Print the FUSE library version to stderr.
.El
.Pp
If the first argument not recognised by
-.Fn fuse_parse_cmd_line
+.Fn fuse_parse_cmdline
is a valid directory then
.Fa mp
will be set to the canonicalized absolute pathname of this directory.
.Sh RETURN VALUES
The
-.Fn fuse_parse_cmd_line
+.Fn fuse_parse_cmdline
function will return 0 on success and -1 if
.Fl h , Fl -help , Fl ho , Fl v
or
@@ -88,11 +88,11 @@ does not exist or is not a directory.
.Xr fuse_setup 3
.Sh STANDARDS
The
-.Fn fuse_parse_cmd_line
+.Fn fuse_parse_cmdline
function conforms to FUSE 2.6.
.Sh HISTORY
The
-.Fn fuse_parse_cmd_line
+.Fn fuse_parse_cmdline
function first appeared in
.Ox 5.4 .
.Sh AUTHORS
diff --git a/lib/libfuse/fuse_setup.3 b/lib/libfuse/fuse_setup.3
index bc4d05015ee..9a1902e8f50 100644
--- a/lib/libfuse/fuse_setup.3
+++ b/lib/libfuse/fuse_setup.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fuse_setup.3,v 1.2 2018/07/08 06:17:10 jmc Exp $
+.\" $OpenBSD: fuse_setup.3,v 1.3 2018/11/28 21:19:11 mpi Exp $
.\"
.\" Copyright (c) 2018 Helg Bredow <helg.bredow@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: July 8 2018 $
+.Dd $Mdocdate: November 28 2018 $
.Dt FUSE_SETUP 3
.Os
.Sh NAME
@@ -54,7 +54,7 @@ The file system will be mounted on
.Fa mp ,
which is the directory specified by the first
argument that does not match one of the options recognised by
-.Xr fuse_parse_cmd_line 3 .
+.Xr fuse_parse_cmdline 3 .
.Pp
.Fa fuse_operations
is a struct of size
@@ -69,7 +69,7 @@ will return NULL on failure.
.Xr fuse_main 3 ,
.Xr fuse_mount 3 ,
.Xr fuse_new 3 ,
-.Xr fuse_parse_cmd_line 3 ,
+.Xr fuse_parse_cmdline 3 ,
.Xr fuse_set_signal_handlers 3 ,
.Xr fuse_teardown 3 ,
.Xr fuse 4
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-05 01:19:11 +0000