diff options
| author |   helg <helg@openbsd.org> | 2017-12-13 12:23:48 +0000 |
|---|---|---|
| committer | helg <helg@openbsd.org> | 2017-12-13 12:23:48 +0000 |
| commit | d997417f91da30ef17aa5132aee92f99a4a9559c (patch) | |
| tree | 6a826d10d8442b1fe146b0d545245e5109ffb850 /lib/libfuse | |
| parent | Fix stray return; hopefully this makes the internal PHY actually work now. (diff) | |
| download | wireguard-openbsd-d997417f91da30ef17aa5132aee92f99a4a9559c.tar.xz wireguard-openbsd-d997417f91da30ef17aa5132aee92f99a4a9559c.zip | |
If the list of templates 'o' passed to fuse_opt_parse(3) is NULL then
the processing function should be called in the same way as if no match
was found.
ok mpi@
Diffstat (limited to 'lib/libfuse')
| -rw-r--r-- | lib/libfuse/fuse_opt.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/libfuse/fuse_opt.c b/lib/libfuse/fuse_opt.c index e7ec4168604..f4bb20428c7 100644 --- a/lib/libfuse/fuse_opt.c +++ b/lib/libfuse/fuse_opt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_opt.c,v 1.22 2017/12/11 12:38:54 helg Exp $ */ +/* $OpenBSD: fuse_opt.c,v 1.23 2017/12/13 12:23:48 helg Exp $ */ /* * Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com> * Copyright (c) 2013 Stefan Sperling <stsp@openbsd.org> @@ -191,13 +191,10 @@ parse_opt(const struct fuse_opt *o, const char *opt, void *data, int keyval, ret, found; size_t sep; - if (o == NULL) - return (IFUSE_OPT_KEEP); - keyval = 0; found = 0; - for(; o->templ; o++) { + for(; o != NULL && o->templ; o++) { sep = match_opt(o->templ, opt); if (sep == 0) continue; |