e5bb88b8f8
Earlier this year we changed our own stderr variable to use the standard name `stderr` (to avoid bugs where someone is using `stderr` instead of the curl-tool specific variable). This solution needed to override the standard `stderr` symbol via the preprocessor. This in turn didn't play well with unity builds and caused curl tool to crash or stay silent due to an uninitialized stderr. This was a hard to find issue, fixed by manually breaking out one file from the unity sources. To avoid two these two tricks, this patch implements a different solution: Restore using our own local variable for our stderr output and leave `stderr` as-is. To avoid using `stderr` by mistake, add a `checksrc` rule (based on logic we already used in lib for `strerror`) that detects any `stderr` use in `src` and points to using our own variable instead: `tool_stderr`. Follow-up to06133d3e9bFollow-up to2f17a9b654Closes #11958
72 lines
2.1 KiB
C
72 lines
2.1 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "tool_setup.h"
|
|
#include "tool_stderr.h"
|
|
#include "tool_msgs.h"
|
|
|
|
#include "memdebug.h" /* keep this as LAST include */
|
|
|
|
FILE *tool_stderr;
|
|
|
|
void tool_init_stderr(void)
|
|
{
|
|
/* !checksrc! disable STDERR 1 */
|
|
tool_stderr = stderr;
|
|
}
|
|
|
|
void tool_set_stderr_file(struct GlobalConfig *global, char *filename)
|
|
{
|
|
FILE *fp;
|
|
|
|
if(!filename)
|
|
return;
|
|
|
|
if(!strcmp(filename, "-")) {
|
|
tool_stderr = stdout;
|
|
return;
|
|
}
|
|
|
|
/* precheck that filename is accessible to lessen the chance that the
|
|
subsequent freopen will fail. */
|
|
fp = fopen(filename, FOPEN_WRITETEXT);
|
|
if(!fp) {
|
|
warnf(global, "Warning: Failed to open %s", filename);
|
|
return;
|
|
}
|
|
fclose(fp);
|
|
|
|
/* freopen the actual stderr (stdio.h stderr) instead of tool_stderr since
|
|
the latter may be set to stdout. */
|
|
/* !checksrc! disable STDERR 1 */
|
|
fp = freopen(filename, FOPEN_WRITETEXT, stderr);
|
|
if(!fp) {
|
|
/* stderr may have been closed by freopen. there is nothing to be done. */
|
|
DEBUGASSERT(0);
|
|
return;
|
|
}
|
|
/* !checksrc! disable STDERR 1 */
|
|
tool_stderr = stderr;
|
|
}
|