summaryrefslogtreecommitdiff
path: root/cmdline/apt-helper.cc
diff options
context:
space:
mode:
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;