summaryrefslogtreecommitdiff
path: root/cmdline/apt-helper.cc
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-01-08 00:35:39 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2016-01-08 15:40:01 +0100
commitabec2980ef1ff051be14c26097a76b6429b3b7bc (patch)
treeb858e69681076ad12875577749ee0b8d0b1decb8 /cmdline/apt-helper.cc
parent0179cfa83cf0042235eda41db7f35c420781c63e (diff)
support '-' and no parameter for stdin in apt-helper cat-file
This way it works more similar to the compressor binaries, which we can relief in this way from their job in the test framework avoiding the need of adding e.g. liblz4-tool to the test dependencies.
Diffstat (limited to 'cmdline/apt-helper.cc')
-rw-r--r--cmdline/apt-helper.cc20
1 files changed, 17 insertions, 3 deletions
diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index 001b5e5f7..b92055ab7 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -145,14 +145,28 @@ static bool DoCatFile(CommandLine &CmdL) /*{{{*/
}
if (CmdL.FileSize() <= 1)
- return _error->Error("Must specify at least one file name");
+ {
+ if (fd.OpenDescriptor(STDIN_FILENO, FileFd::ReadOnly) == false)
+ return false;
+ if (CopyFile(fd, out) == false)
+ return false;
+ return true;
+ }
for(size_t i = 1; CmdL.FileList[i] != NULL; ++i)
{
std::string const name = CmdL.FileList[i];
- if (fd.Open(name, FileFd::ReadOnly, FileFd::Extension) == false)
- return false;
+ if (name != "-")
+ {
+ if (fd.Open(name, FileFd::ReadOnly, FileFd::Extension) == false)
+ return false;
+ }
+ else
+ {
+ if (fd.OpenDescriptor(STDIN_FILENO, FileFd::ReadOnly) == false)
+ return false;
+ }
if (CopyFile(fd, out) == false)
return false;