leonetienne/GCrypt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now by-default prepending a newline to stdout

Browse Source
This commit is contained in:
Leonetienne 2022-05-31 18:26:02 +02:00
parent ba37b4325c
commit d9fb90a01e
No known key found for this signature in database
GPG Key ID: C33879CD92E9708C
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GCryptCLI/src/CommandlineInterface.cpp
View File

@ -105,6 +105,9 @@ void CommandlineInterface::Init(int argc, const char* const* argv) {
nupp.RegisterDescription("--puffer-output", "Will digest the entire data before initiating any output."); nupp.RegisterDescription("--puffer-output", "Will digest the entire data before initiating any output.");
nupp.RegisterConstraint("--puffer-output", ParamConstraint(true, DATA_TYPE::VOID, {}, false, {})); nupp.RegisterConstraint("--puffer-output", ParamConstraint(true, DATA_TYPE::VOID, {}, false, {}));
nupp.RegisterDescription("--no-newline", "Don't postfix stdout output with a newline");
nupp.RegisterConstraint("--no-newline", ParamConstraint(true, DATA_TYPE::VOID, {}, false, {}));
/* Now parse */ /* Now parse */
nupp.Parse(argc, argv); nupp.Parse(argc, argv);

12
GCryptCLI/src/DataOutputLayer.cpp
View File

@ -24,7 +24,7 @@ void DataOutputLayer::Init() {
// Open the file // Open the file
ofs.open( ofs.open(
Configuration::inputFilename, Configuration::outputFilename,
std::ios::out | std::ios::binary std::ios::out | std::ios::binary
); );
@ -102,6 +102,16 @@ void DataOutputLayer::WriteBlock() {
*out << " "; *out << " ";
} }
// If we are finished, and are outputting to stdout,
// and the user didn't specifically opt out, print a newline
if (
(IsFinished()) &&
(Configuration::outputTo == Configuration::OUTPUT_TO::STDOUT) &&
(!CommandlineInterface::Get().HasParam("--no-newline"))
) {
*out << std::endl;
}
} }
return; return;