Skip to content

[core] GetPipe: allow storing return value and redirect stderr #18123

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
dpiparo merged 2 commits into from
Mar 26, 2025
Merged

[core] GetPipe: allow storing return value and redirect stderr #18123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b2a9d5
[core] GetPipe: allow storing return value and redirect stderr
ferdymercury Mar 25, 2025
7018450
[core] use old-style notation for consistency with rest of file
ferdymercury Mar 26, 2025
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
2 changes: 1 addition & 1 deletion core/base/inc/TSystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ class TSystem : public TNamed {
virtual Int_t Exec(const char *shellcmd);
virtual FILE *OpenPipe(const char *command, const char *mode);
virtual int ClosePipe(FILE *pipe);
virtual TString GetFromPipe(const char *command);
virtual TString GetFromPipe(const char *command, Int_t *ret = nullptr, Bool_t redirectStderr = kFALSE);
virtual int GetPid();
virtual void StackTrace();

Expand Down
21 changes: 16 additions & 5 deletions core/base/src/TSystem.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,14 +676,22 @@ int TSystem::ClosePipe(FILE*)

////////////////////////////////////////////////////////////////////////////////
/// Execute command and return output in TString.
/// @param command the command to be executed
/// @param ret pointer to the memory where to store the returned value of the
/// command, i.e. the result of ClosePipe (p-close stream, the status of its child).
/// If ret is nullptr, the returned value is not stored anywhere.
/// @param redirectStderr if true, stderr will be redirected to stdout
/// @return the stdout of the command as TString (from the p-opened FILE stream)

TString TSystem::GetFromPipe(const char *command)
TString TSystem::GetFromPipe(const char *command, Int_t *ret, Bool_t redirectStderr)
{
TString out;

FILE *pipe = OpenPipe(command, "r");
TString scommand = command;
if (redirectStderr)
scommand += " 2>&1";
FILE *pipe = OpenPipe(scommand.Data(), "r");
if (!pipe) {
SysError("GetFromPipe", "cannot run command \"%s\"", command);
SysError("GetFromPipe", "cannot run command \"%s\"", scommand.Data());
return out;
}

Expand All @@ -696,7 +704,10 @@ TString TSystem::GetFromPipe(const char *command)

Int_t r = ClosePipe(pipe);
if (r) {
Error("GetFromPipe", "command \"%s\" returned %d", command, r);
Error("GetFromPipe", "command \"%s\" returned %d", scommand.Data(), r);
}
if (ret) {
*ret = r;
}
return out;
}
Expand Down
Loading