ensure a good clock() value for usage and tests

[apt.git] / cmdline / apt-helper.cc

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index e8b16c4e5bd1accfeb0db9c19dcec6b80b7411c3..fd99fba8bb868ee87201c343cd0a1f59709e1ed2 100644 (file)
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -39,7 +39,8 @@ static bool DoAutoDetectProxy(CommandLine &CmdL)                      /*{{{*/
    if (CmdL.FileSize() != 2)
       return _error->Error(_("Need one URL as argument"));
    URI ServerURL(CmdL.FileList[1]);
-   AutoDetectProxy(ServerURL);
+   if (AutoDetectProxy(ServerURL) == false)
+      return false;
    std::string SpecificProxy = _config->Find("Acquire::"+ServerURL.Access+"::Proxy::" + ServerURL.Host);
    ioprintf(std::cout, "Using proxy '%s' for URL '%s'\n",
             SpecificProxy.c_str(), std::string(ServerURL).c_str());
@@ -102,38 +103,74 @@ static bool DoSrvLookup(CommandLine &CmdL)                                /*{{{*/
         _error->Error(_("GetSrvRec failed for %s"), name.c_str());
 
       for (SrvRec const &I : srv_records)
-        c1out << I.target << "\t" << I.priority << "\t" << I.weight << "\t" << I.port << std::endl;
+        ioprintf(c1out, "%s\t%d\t%d\t%d\n", I.target.c_str(), I.priority, I.weight, I.port);
    }
    return true;
 }
                                                                        /*}}}*/
+static const APT::Configuration::Compressor *FindCompressor(std::vector<APT::Configuration::Compressor> const & compressors, std::string name)                         /*{{{*/
+{
+   APT::Configuration::Compressor const * compressor = NULL;
+   for (auto const & c : compressors)
+   {
+      if (compressor != NULL && c.Cost >= compressor->Cost)
+         continue;
+      if (c.Name == name || c.Extension == name || (!c.Extension.empty() && c.Extension.substr(1) == name))
+         compressor = &c;
+   }
+
+   return compressor;
+}
+                                                                       /*}}}*/
 static bool DoCatFile(CommandLine &CmdL)                               /*{{{*/
 {
    FileFd fd;
    FileFd out;
-   char buf[4096];
-   unsigned long long read;
+   std::string const compressorName = _config->Find("Apt-Helper::Cat-File::Compress", "");
 
-   out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly);
+   if (compressorName.empty() == false)
+   {
+
+      auto const compressors = APT::Configuration::getCompressors();
+      auto const compressor = FindCompressor(compressors, compressorName);
+
+      if (compressor == NULL)
+         return _error->Error("Could not find compressor: %s", compressorName.c_str());
+
+      if (out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly, *compressor) == false)
+         return false;
+   } else
+   {
+      if (out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly) == false)
+         return false;
+   }
 
    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;
-
-      for (;;) {
-         if (fd.Read(buf, sizeof(buf), &read) == false)
-            return false;
-         if (read == 0)
-            break;
-         if (out.Write(buf, read) == 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;
    }
    return true;
 }
@@ -163,8 +200,6 @@ static std::vector<aptDispatchWithHelp> GetCommands()                       /*{{{*/
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
-   InitLocale();
-
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_HELPER, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);