summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsyl <syl@openbsd.org>2014-04-15 08:48:11 +0000
committersyl <syl@openbsd.org>2014-04-15 08:48:11 +0000
commit6590e1b9dd9d84c942766bf471610cd690cc8b26 (patch)
tree54c6087e33f627c7b95d3494fb59f303b127ae90
parentreply with correct imsg when using non-system auth. (diff)
downloadwireguard-openbsd-6590e1b9dd9d84c942766bf471610cd690cc8b26.tar.xz
wireguard-openbsd-6590e1b9dd9d84c942766bf471610cd690cc8b26.zip
Init outargs only once, and fix a bad bzero().
Spotted by jsg@, ok jsg@
-rw-r--r--lib/libfuse/fuse_opt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libfuse/fuse_opt.c b/lib/libfuse/fuse_opt.c
index 16f475ef19e..cc3e34b3ee4 100644
--- a/lib/libfuse/fuse_opt.c
+++ b/lib/libfuse/fuse_opt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fuse_opt.c,v 1.8 2014/01/21 22:26:11 jca Exp $ */
+/* $OpenBSD: fuse_opt.c,v 1.9 2014/04/15 08:48:11 syl Exp $ */
/*
* Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
* Copyright (c) 2013 Stefan Sperling <stsp@openbsd.org>
@@ -259,7 +259,7 @@ int
fuse_opt_parse(struct fuse_args *args, void *data,
const struct fuse_opt *opt, fuse_opt_proc_t f)
{
- struct fuse_args outargs = FUSE_ARGS_INIT(args->argc, args->argv);
+ struct fuse_args outargs;
const char *arg;
int ret = 0;
int i;
@@ -267,7 +267,7 @@ fuse_opt_parse(struct fuse_args *args, void *data,
if (!f || !args || !args->argc || !args->argv)
return (0);
- bzero(&outargs, sizeof(args));
+ bzero(&outargs, sizeof(outargs));
fuse_opt_add_arg(&outargs, args->argv[0]);
for (i = 1; i < args->argc; i++) {