Skip to content

Handle stdout redirection on windows with CON #1063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bruno-at-orange merged 3 commits into from
Jul 3, 2026
Merged

Handle stdout redirection on windows with CON #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd9dbd9
Handle stdout redirection on windows with CON
bruno-at-orange Jun 18, 2026
bd0233b
After review
bruno-at-orange Jul 3, 2026
3aa87c2
fix bug
bruno-at-orange Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Norm/base/CommandFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ void CommandFile::SetOutputCommandFileName(const ALString& sFileName)
#ifdef __linux_or_apple__
if (sOutputCommandFileName == "/dev/stdout" or sOutputCommandFileName == "/dev/stderr")
bPrintOutputInConsole = true;
#elif defined(_WIN32)
if (sOutputCommandFileName == "CON")
bPrintOutputInConsole = true;
#endif
}

Expand Down
3 changes: 3 additions & 0 deletions src/Norm/base/Ermgt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,9 @@ boolean Global::SetErrorLogFileName(const ALString& sValue)
#ifdef __linux_or_apple__
if (sValue == "/dev/stdout" or sValue == "/dev/stderr")
bPrintMessagesInConsole = true;
#elif defined(_WIN32)
if (sValue == "CON")
bPrintMessagesInConsole = true;
#endif
}
return bOk;
Expand Down
3 changes: 3 additions & 0 deletions src/Norm/base/TaskProgressionManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ void FileTaskProgressionManager::SetTaskProgressionFileName(const ALString& sFil
#ifdef __linux_or_apple__
if (sFileName == "/dev/stdout" or sFileName == "/dev/stderr")
bPrintProgressionInConsole = true;
#elif defined(_WIN32)
if (sFileName == "CON")
bPrintProgressionInConsole = true;
#endif
}
}
Expand Down
38 changes: 34 additions & 4 deletions src/Norm/base/UIObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,9 +1685,12 @@ boolean UIObject::CheckCommandLineOptions(const ObjectArray& oaOptions)

// Acces aux fichiers passes en parametre
fsInputFile = NULL;
fsInputJsonFile = NULL;
fsProgressionFile = NULL;
fsOutputFile = NULL;
fsOutputNoReplayFile = NULL;
fsErrorFile = NULL;

for (i = 0; i < oaOptions.GetSize(); i++)
{
option = cast(CommandLineOption*, oaOptions.GetAt(i));
Expand Down Expand Up @@ -1750,6 +1753,31 @@ boolean UIObject::CheckCommandLineOptions(const ObjectArray& oaOptions)
Global::AddError("Command line parameters", "",
"wrong input command file " + fsInputFile->GetFilePathName());
}
#elif defined(_WIN32)
if (fsInputFile != NULL and fsInputFile->GetFilePathName() == "CON")
{
bOk = false;
Global::AddError("Command line parameters", "",
"wrong input command file " + fsInputFile->GetFilePathName());
}
#endif

// Test que le fichier d'entree json n'est pas une sortie
#ifdef __linux_or_apple__
if (fsInputJsonFile != NULL and (fsInputJsonFile->GetFilePathName() == "/dev/stdout" or
fsInputJsonFile->GetFilePathName() == "/dev/stderr"))
{
bOk = false;
Global::AddError("Command line parameters", "",
"wrong input command file " + fsInputFile->GetFilePathName());
}
#elif defined(_WIN32)
if (fsInputJsonFile != NULL and fsInputJsonFile->GetFilePathName() == "CON")
{
bOk = false;
Global::AddError("Command line parameters", "",
"wrong input command file " + fsInputJsonFile->GetFilePathName());
}
#endif

// Test de conflit entre les noms de fichiers : les fichiers doivent tous etre differents
Expand All @@ -1764,13 +1792,15 @@ boolean UIObject::CheckCommandLineOptions(const ObjectArray& oaOptions)

// Test de difference
#ifdef _WIN32
bOk = bOk and fsFileToCompare->CheckReferenceFileSpec(fsFile);
bOk = bOk and (fsFileToCompare->GetFilePathName() == "CON" and
fsFile->GetFilePathName() == "CON") or
(fsFileToCompare->CheckReferenceFileSpec(fsFile));
#else
bOk = bOk and (fsFileToCompare->CheckReferenceFileSpec(fsFile) or
(fsFileToCompare->GetFilePathName() == "/dev/stdout" and
bOk = bOk and ((fsFileToCompare->GetFilePathName() == "/dev/stdout" and
fsFile->GetFilePathName() == "/dev/stdout") or
(fsFileToCompare->GetFilePathName() == "/dev/stderr" and
fsFile->GetFilePathName() == "/dev/stderr"));
fsFile->GetFilePathName() == "/dev/stderr") or
fsFileToCompare->CheckReferenceFileSpec(fsFile));
#endif // _WIN32
if (not bOk)
break;
Expand Down
Loading