alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bin: fix handling of -o '>>-' in the close/reopen path

Browse source 
* tests/core/serial.test: Add test case.
* bin/common_file.cc: Fix it.
This commit is contained in:
Alexandre Duret-Lutz 2023-07-26 21:50:16 +02:00
parent 0923f8efe2
commit 61e43edde8
2 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
bin/common_file.cc
View file

@ -47,16 +47,13 @@ output_file::output_file(const char* name, bool force_append)
void
output_file::reopen_for_append(const std::string& name)
{
if (of_ && of_->is_open()) // nothing to do
if (os_ == &std::cout || of_->is_open()) // nothing to do
return;
const char* cname = name.c_str();
if (cname[0] == '>' && cname[1] == '>')
cname += 2;
if (name[0] == '-' && name[1] == 0)
{
os_ = &std::cout;
return;
}
// the name cannot be "-" at this point, otherwise os_ would be
// equal to std::cout.
of_->open(cname, std::ios_base::app);
if (!*of_)
error(2, errno, "cannot reopen '%s'", cname);