diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2020-02-06 19:41:40 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2020-02-06 19:41:40 +0000 |
| commit | 181a689064792fe61edda70bb2ade55b524dbef8 (patch) | |
| tree | c1691d2a16cbf396cd9b0b6f86c1b4f62563a0bf /main.c | |
| parent | 902cd39eea04826a46097ae7cd4ccecc3411bcb1 (diff) | |
| download | mandoc-181a689064792fe61edda70bb2ade55b524dbef8.tar.gz mandoc-181a689064792fe61edda70bb2ade55b524dbef8.tar.zst mandoc-181a689064792fe61edda70bb2ade55b524dbef8.zip | |
Make sure that -l always causes -w to be ignored, as documented
in the man(1) manual page. This bugfix is needed to prevent
the command "man -lw" from dereferencing a NULL pointer.
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -1,7 +1,7 @@ -/* $Id: main.c,v 1.341 2020/01/20 10:37:15 schwarze Exp $ */ +/* $Id: main.c,v 1.342 2020/02/06 19:41:40 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2010-2012, 2014-2019 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2010-2012, 2014-2020 Ingo Schwarze <schwarze@openbsd.org> * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org> * * Permission to use, copy, modify, and distribute this software for any @@ -326,7 +326,8 @@ main(int argc, char *argv[]) /* Postprocess options. */ - if (outmode == OUTMODE_DEF) { + switch (outmode) { + case OUTMODE_DEF: switch (search.argmode) { case ARG_FILE: outmode = OUTMODE_ALL; @@ -339,6 +340,16 @@ main(int argc, char *argv[]) outmode = OUTMODE_LST; break; } + break; + case OUTMODE_FLN: + if (search.argmode == ARG_FILE) + outmode = OUTMODE_ALL; + break; + case OUTMODE_ALL: + break; + case OUTMODE_LST: + case OUTMODE_ONE: + abort(); } if (oarg != NULL) { |