diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2019-01-10 06:29:00 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2019-01-10 06:29:00 +0000 |
| commit | 6719c1661f033ee6a197313c077e571a96ce1359 (patch) | |
| tree | a4f18b3c969a7a17371c6910ecffe83f54ee8735 | |
| parent | 81110a42d3e8acf54bd059afb29098770437d398 (diff) | |
| download | mandoc-6719c1661f033ee6a197313c077e571a96ce1359.tar.gz mandoc-6719c1661f033ee6a197313c077e571a96ce1359.tar.zst mandoc-6719c1661f033ee6a197313c077e571a96ce1359.zip | |
Initializers for file-scope static variables should be compile-time
constants, and while stderr is a compile-time constant in OpenBSD,
Kelvin Sherlock <ksherlock at gmail dot com> reports that it isn't
on some other systems, for example on FreeBSD or Linux.
So do the initialization by calling mandoc_msg_setoutfile()
from main() instead.
| -rw-r--r-- | main.c | 5 | ||||
| -rw-r--r-- | mandoc_msg.c | 4 |
2 files changed, 5 insertions, 4 deletions
@@ -1,7 +1,7 @@ -/* $Id: main.c,v 1.316 2019/01/01 08:18:11 schwarze Exp $ */ +/* $Id: main.c,v 1.317 2019/01/10 06:29:00 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2010-2012, 2014-2018 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2010-2012, 2014-2019 Ingo Schwarze <schwarze@openbsd.org> * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org> * * Permission to use, copy, modify, and distribute this software for any @@ -148,6 +148,7 @@ main(int argc, char *argv[]) setprogname(progname); #endif + mandoc_msg_setoutfile(stderr); if (strncmp(progname, "mandocdb", 8) == 0 || strcmp(progname, BINM_MAKEWHATIS) == 0) return mandocdb(argc, argv); diff --git a/mandoc_msg.c b/mandoc_msg.c index 5dfa26d1..4c4fabb9 100644 --- a/mandoc_msg.c +++ b/mandoc_msg.c @@ -1,4 +1,4 @@ -/* $Id: mandoc_msg.c,v 1.4 2018/12/16 00:21:05 schwarze Exp $ */ +/* $Id: mandoc_msg.c,v 1.5 2019/01/10 06:29:00 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014,2015,2016,2017,2018 Ingo Schwarze <schwarze@openbsd.org> @@ -240,7 +240,7 @@ static const char *const type_message[MANDOCERR_MAX] = { "ignoring macro in table", }; -static FILE *fileptr = stderr; +static FILE *fileptr = NULL; static const char *filename = NULL; static enum mandocerr min_type = MANDOCERR_MAX; static enum mandoclevel rc = MANDOCLEVEL_OK; |