]> git.saurik.com Git - apt.git/blobdiff - apt-pkg/aptconfiguration.cc
tests: don't do boundless string compares with data()
[apt.git] / apt-pkg / aptconfiguration.cc
index a0566e05e3be4f8b2f0f507d50d681d0ee209c86..0035f70dfbcf5a2522ed201d1e67748275072905 100644 (file)
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/pkgsystem.h>
 
-#include <sys/types.h>
 #include <dirent.h>
 #include <stdio.h>
-
+#include <fcntl.h>
+#include <ctype.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <algorithm>
 #include <string>
 #include <vector>
+
                                                                        /*}}}*/
 namespace APT {
-// getCompressionTypes - Return Vector of usbale compressiontypes      /*{{{*/
+// setDefaultConfigurationForCompressors                               /*{{{*/
+static void setDefaultConfigurationForCompressors() {
+       // Set default application paths to check for optional compression types
+       _config->CndSet("Dir::Bin::gzip", "/bin/gzip");
+       _config->CndSet("Dir::Bin::bzip2", "/bin/bzip2");
+       _config->CndSet("Dir::Bin::xz", "/usr/bin/xz");
+       _config->CndSet("Dir::Bin::lz4", "/usr/bin/lz4");
+       if (FileExists(_config->Find("Dir::Bin::xz")) == true) {
+               _config->Set("Dir::Bin::lzma", _config->Find("Dir::Bin::xz"));
+               _config->Set("APT::Compressor::lzma::Binary", "xz");
+               if (_config->Exists("APT::Compressor::lzma::CompressArg") == false) {
+                       _config->Set("APT::Compressor::lzma::CompressArg::", "--format=lzma");
+                       _config->Set("APT::Compressor::lzma::CompressArg::", "-6");
+               }
+               if (_config->Exists("APT::Compressor::lzma::UncompressArg") == false) {
+                       _config->Set("APT::Compressor::lzma::UncompressArg::", "--format=lzma");
+                       _config->Set("APT::Compressor::lzma::UncompressArg::", "-d");
+               }
+       } else {
+               _config->CndSet("Dir::Bin::lzma", "/usr/bin/lzma");
+               if (_config->Exists("APT::Compressor::lzma::CompressArg") == false) {
+                       _config->Set("APT::Compressor::lzma::CompressArg::", "--suffix=");
+                       _config->Set("APT::Compressor::lzma::CompressArg::", "-6");
+               }
+               if (_config->Exists("APT::Compressor::lzma::UncompressArg") == false) {
+                       _config->Set("APT::Compressor::lzma::UncompressArg::", "--suffix=");
+                       _config->Set("APT::Compressor::lzma::UncompressArg::", "-d");
+               }
+       }
+       // setup the defaults for the compressiontypes => method mapping
+       _config->CndSet("Acquire::CompressionTypes::xz","xz");
+       _config->CndSet("Acquire::CompressionTypes::bz2","bzip2");
+       _config->CndSet("Acquire::CompressionTypes::lzma","lzma");
+       _config->CndSet("Acquire::CompressionTypes::gz","gzip");
+       _config->CndSet("Acquire::CompressionTypes::lz4","lz4");
+}
+                                                                       /*}}}*/
+// getCompressionTypes - Return Vector of usable compressiontypes      /*{{{*/
 // ---------------------------------------------------------------------
-/* return a vector of compression types in the prefered order. */
+/* return a vector of compression types in the preferred order. */
 std::vector<std::string>
 const Configuration::getCompressionTypes(bool const &Cached) {
        static std::vector<std::string> types;
@@ -39,18 +82,7 @@ const Configuration::getCompressionTypes(bool const &Cached) {
                        types.clear();
        }
 
-       // setup the defaults for the compressiontypes => method mapping
-       _config->CndSet("Acquire::CompressionTypes::bz2","bzip2");
-       _config->CndSet("Acquire::CompressionTypes::xz","xz");
-       _config->CndSet("Acquire::CompressionTypes::lzma","lzma");
-       _config->CndSet("Acquire::CompressionTypes::gz","gzip");
-
-       setDefaultConfigurationForCompressors();
-
-       // accept non-list order as override setting for config settings on commandline
-       std::string const overrideOrder = _config->Find("Acquire::CompressionTypes::Order","");
-       if (overrideOrder.empty() == false)
-               types.push_back(overrideOrder);
+       std::vector<APT::Configuration::Compressor> const compressors = getCompressors();
 
        // load the order setting into our vector
        std::vector<std::string> const order = _config->FindVector("Acquire::CompressionTypes::Order");
@@ -59,15 +91,15 @@ const Configuration::getCompressionTypes(bool const &Cached) {
                if ((*o).empty() == true)
                        continue;
                // ignore types we have no method ready to use
-               if (_config->Exists(std::string("Acquire::CompressionTypes::").append(*o)) == false)
+               std::string const method = std::string("Acquire::CompressionTypes::").append(*o);
+               if (_config->Exists(method) == false)
                        continue;
                // ignore types we have no app ready to use
-               std::string const appsetting = std::string("Dir::Bin::").append(*o);
-               if (_config->Exists(appsetting) == true) {
-                       std::string const app = _config->FindFile(appsetting.c_str(), "");
-                       if (app.empty() == false && FileExists(app) == false)
-                               continue;
-               }
+               std::string const app = _config->Find(method);
+               if (std::find_if(compressors.begin(), compressors.end(), [&app](APT::Configuration::Compressor const &c) {
+                               return c.Name == app;
+                       }) == compressors.end())
+                       continue;
                types.push_back(*o);
        }
 
@@ -83,19 +115,17 @@ const Configuration::getCompressionTypes(bool const &Cached) {
                if (std::find(types.begin(),types.end(),Types->Tag) != types.end())
                        continue;
                // ignore types we have no app ready to use
-               std::string const appsetting = std::string("Dir::Bin::").append(Types->Value);
-               if (appsetting.empty() == false && _config->Exists(appsetting) == true) {
-                       std::string const app = _config->FindFile(appsetting.c_str(), "");
-                       if (app.empty() == false && FileExists(app) == false)
-                               continue;
-               }
+               if (std::find_if(compressors.begin(), compressors.end(), [&Types](APT::Configuration::Compressor const &c) {
+                               return c.Name == Types->Value;
+                       }) == compressors.end())
+                       continue;
                types.push_back(Types->Tag);
        }
 
        // add the special "uncompressed" type
        if (std::find(types.begin(), types.end(), "uncompressed") == types.end())
        {
-               std::string const uncompr = _config->FindFile("Dir::Bin::uncompressed", "");
+               std::string const uncompr = _config->Find("Dir::Bin::uncompressed", "");
                if (uncompr.empty() == true || FileExists(uncompr) == true)
                        types.push_back("uncompressed");
        }
@@ -105,7 +135,7 @@ const Configuration::getCompressionTypes(bool const &Cached) {
                                                                        /*}}}*/
 // GetLanguages - Return Vector of Language Codes                      /*{{{*/
 // ---------------------------------------------------------------------
-/* return a vector of language codes in the prefered order.
+/* return a vector of language codes in the preferred order.
    the special word "environment" will be replaced with the long and the short
    code of the local settings and it will be insured that this will not add
    duplicates. So in an german local the setting "environment, de_DE, en, de"
@@ -137,12 +167,12 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
        // so they will be all included in the Cache.
        std::vector<string> builtin;
        DIR *D = opendir(_config->FindDir("Dir::State::lists").c_str());
-       if (D != 0) {
+       if (D != NULL) {
                builtin.push_back("none");
                for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) {
-                       string const name = Ent->d_name;
+                       string const name = SubstVar(Ent->d_name, "%5f", "_");
                        size_t const foundDash = name.rfind("-");
-                       size_t const foundUnderscore = name.rfind("_");
+                       size_t const foundUnderscore = name.rfind("_", foundDash);
                        if (foundDash == string::npos || foundUnderscore == string::npos ||
                            foundDash <= foundUnderscore ||
                            name.substr(foundUnderscore+1, foundDash-(foundUnderscore+1)) != "Translation")
@@ -153,7 +183,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                        // Skip unusual files, like backups or that alike
                        string::const_iterator s = c.begin();
                        for (;s != c.end(); ++s) {
-                               if (isalpha(*s) == 0)
+                               if (isalpha(*s) == 0 && *s != '_')
                                        break;
                        }
                        if (s != c.end())
@@ -162,8 +192,8 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                                continue;
                        builtin.push_back(c);
                }
+               closedir(D);
        }
-       closedir(D);
 
        // FIXME: Remove support for the old APT::Acquire::Translation
        // it was undocumented and so it should be not very widthly used
@@ -189,7 +219,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
        // get the environment language codes: LC_MESSAGES (and later LANGUAGE)
        // we extract both, a long and a short code and then we will
        // check if we actually need both (rare) or if the short is enough
-       string const envMsg = string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : *Locale);
+       string const envMsg = string(Locale == 0 ? ::setlocale(LC_MESSAGES, NULL) : *Locale);
        size_t const lenShort = (envMsg.find('_') != string::npos) ? envMsg.find('_') : 2;
        size_t const lenLong = (envMsg.find_first_of(".@") != string::npos) ? envMsg.find_first_of(".@") : (lenShort + 3);
 
@@ -223,55 +253,11 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                        }
                }
        } else {
+               // cornercase: LANG=C, so we use only "en" Translation
                environment.push_back("en");
        }
 
-       // Support settings like Acquire::Languages=none on the command line to
-       // override the configuration settings vector of languages.
-       string const forceLang = _config->Find("Acquire::Languages","");
-       if (forceLang.empty() == false) {
-               if (forceLang == "environment") {
-                       codes = environment;
-               } else if (forceLang != "none")
-                       codes.push_back(forceLang);
-               allCodes = codes;
-               for (std::vector<string>::const_iterator b = builtin.begin();
-                    b != builtin.end(); ++b)
-                       if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end())
-                               allCodes.push_back(*b);
-               if (All == true)
-                       return allCodes;
-               else
-                       return codes;
-       }
-
-       // cornercase: LANG=C, so we use only "en" Translation
-       if (envShort == "C") {
-               allCodes = codes = environment;
-               allCodes.insert(allCodes.end(), builtin.begin(), builtin.end());
-               if (All == true)
-                       return allCodes;
-               else
-                       return codes;
-       }
-
-       std::vector<string> const lang = _config->FindVector("Acquire::Languages");
-       // the default setting -> "environment, en"
-       if (lang.empty() == true) {
-               codes = environment;
-               if (envShort != "en")
-                       codes.push_back("en");
-               allCodes = codes;
-               for (std::vector<string>::const_iterator b = builtin.begin();
-                    b != builtin.end(); ++b)
-                       if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end())
-                               allCodes.push_back(*b);
-               if (All == true)
-                       return allCodes;
-               else
-                       return codes;
-       }
-
+       std::vector<string> const lang = _config->FindVector("Acquire::Languages", "environment,en");
        // the configs define the order, so add the environment
        // then needed and ensure the codes are not listed twice.
        bool noneSeen = false;
@@ -298,10 +284,15 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                allCodes.push_back(*l);
        }
 
-       for (std::vector<string>::const_iterator b = builtin.begin();
-            b != builtin.end(); ++b)
-               if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end())
-                       allCodes.push_back(*b);
+       if (allCodes.empty() == false) {
+               for (std::vector<string>::const_iterator b = builtin.begin();
+                    b != builtin.end(); ++b)
+                       if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end())
+                               allCodes.push_back(*b);
+       } else {
+               // "none" was forced
+               allCodes.push_back("none");
+       }
 
        if (All == true)
                return allCodes;
@@ -309,7 +300,18 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
                return codes;
 }
                                                                        /*}}}*/
-// getArchitectures - Return Vector of prefered Architectures          /*{{{*/
+// checkLanguage - are we interested in the given Language?            /*{{{*/
+bool Configuration::checkLanguage(std::string Lang, bool const All) {
+       // the empty Language is always interesting as it is the original
+       if (Lang.empty() == true)
+               return true;
+       // filenames are encoded, so undo this
+       Lang = SubstVar(Lang, "%5f", "_");
+       std::vector<std::string> const langs = getLanguages(All, true);
+       return (std::find(langs.begin(), langs.end(), Lang) != langs.end());
+}
+                                                                       /*}}}*/
+// getArchitectures - Return Vector of preferred Architectures         /*{{{*/
 std::vector<std::string> const Configuration::getArchitectures(bool const &Cached) {
        using std::string;
 
@@ -320,37 +322,8 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache
        string const arch = _config->Find("APT::Architecture");
        archs = _config->FindVector("APT::Architectures");
 
-       if (unlikely(arch.empty() == true))
-               return archs;
-
-       // FIXME: It is a bit unclean to have debian specific code hereā€¦
-       if (archs.empty() == true) {
-               archs.push_back(arch);
-               string dpkgcall = _config->Find("Dir::Bin::dpkg", "dpkg");
-               std::vector<string> const dpkgoptions = _config->FindVector("DPkg::options");
-               for (std::vector<string>::const_iterator o = dpkgoptions.begin();
-                    o != dpkgoptions.end(); ++o)
-                       dpkgcall.append(" ").append(*o);
-               dpkgcall.append(" --print-foreign-architectures 2> /dev/null");
-               FILE *dpkg = popen(dpkgcall.c_str(), "r");
-               char buf[1024];
-               if(dpkg != NULL) {
-                       if (fgets(buf, sizeof(buf), dpkg) != NULL) {
-                               char* arch = strtok(buf, " ");
-                               while (arch != NULL) {
-                                       for (; isspace(*arch) != 0; ++arch);
-                                       if (arch[0] != '\0') {
-                                               char const* archend = arch;
-                                               for (; isspace(*archend) == 0 && *archend != '\0'; ++archend);
-                                               archs.push_back(string(arch, (archend - arch)));
-                                       }
-                                       arch = strtok(NULL, " ");
-                               }
-                       }
-                       pclose(dpkg);
-               }
-               return archs;
-       }
+       if (archs.empty() == true)
+          archs = _system->ArchitecturesSupported();
 
        if (archs.empty() == true ||
            std::find(archs.begin(), archs.end(), arch) == archs.end())
@@ -369,22 +342,14 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache
 }
                                                                        /*}}}*/
 // checkArchitecture - are we interested in the given Architecture?    /*{{{*/
-bool const Configuration::checkArchitecture(std::string const &Arch) {
+bool Configuration::checkArchitecture(std::string const &Arch) {
        if (Arch == "all")
                return true;
        std::vector<std::string> const archs = getArchitectures(true);
        return (std::find(archs.begin(), archs.end(), Arch) != archs.end());
 }
                                                                        /*}}}*/
-// setDefaultConfigurationForCompressors                               /*{{{*/
-void Configuration::setDefaultConfigurationForCompressors() {
-       // Set default application paths to check for optional compression types
-       _config->CndSet("Dir::Bin::lzma", "/usr/bin/lzma");
-       _config->CndSet("Dir::Bin::xz", "/usr/bin/xz");
-       _config->CndSet("Dir::Bin::bzip2", "/bin/bzip2");
-}
-                                                                       /*}}}*/
-// getCompressors - Return Vector of usbale compressors                        /*{{{*/
+// getCompressors - Return Vector of usealbe compressors               /*{{{*/
 // ---------------------------------------------------------------------
 /* return a vector of compressors used by apt-ftparchive in the
    multicompress functionality or to detect data.tar files */
@@ -400,22 +365,47 @@ const Configuration::getCompressors(bool const Cached) {
 
        setDefaultConfigurationForCompressors();
 
-       compressors.push_back(Compressor(".", "", "", "", "", 1));
-       if (_config->Exists("Dir::Bin::gzip") == false || FileExists(_config->FindFile("Dir::Bin::gzip")) == true)
-               compressors.push_back(Compressor("gzip",".gz","gzip","-9n","-d",2));
-       if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->FindFile("Dir::Bin::bzip2")) == true)
-               compressors.push_back(Compressor("bzip2",".bz2","bzip2","-9","-d",3));
-       if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->FindFile("Dir::Bin::lzma")) == true)
-               compressors.push_back(Compressor("lzma",".lzma","lzma","-9","-d",4));
-       if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->FindFile("Dir::Bin::xz")) == true)
-               compressors.push_back(Compressor("xz",".xz","xz","-6","-d",5));
-
-       std::vector<std::string> const comp = _config->FindVector("APT::Compressor");
-       for (std::vector<std::string>::const_iterator c = comp.begin();
-            c != comp.end(); ++c) {
-               if (*c == "." || *c == "gzip" || *c == "bzip2" || *c == "lzma" || *c == "xz")
+       std::vector<std::string> CompressorsDone;
+# define APT_ADD_COMPRESSOR(NAME, EXT, BINARY, ARG, DEARG, COST) \
+       { CompressorsDone.push_back(NAME); compressors.emplace_back(NAME, EXT, BINARY, ARG, DEARG, COST); }
+       APT_ADD_COMPRESSOR(".", "", "", nullptr, nullptr, 0)
+       if (_config->Exists("Dir::Bin::lz4") == false || FileExists(_config->Find("Dir::Bin::lz4")) == true)
+               APT_ADD_COMPRESSOR("lz4",".lz4","lz4","-1","-d",50)
+#ifdef HAVE_LZ4
+       else
+               APT_ADD_COMPRESSOR("lz4",".lz4","false", nullptr, nullptr, 50)
+#endif
+       if (_config->Exists("Dir::Bin::gzip") == false || FileExists(_config->Find("Dir::Bin::gzip")) == true)
+               APT_ADD_COMPRESSOR("gzip",".gz","gzip","-6n","-d",100)
+#ifdef HAVE_ZLIB
+       else
+               APT_ADD_COMPRESSOR("gzip",".gz","false", nullptr, nullptr, 100)
+#endif
+       if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->Find("Dir::Bin::xz")) == true)
+               APT_ADD_COMPRESSOR("xz",".xz","xz","-6","-d",200)
+#ifdef HAVE_LZMA
+       else
+               APT_ADD_COMPRESSOR("xz",".xz","false", nullptr, nullptr, 200)
+#endif
+       if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->Find("Dir::Bin::bzip2")) == true)
+               APT_ADD_COMPRESSOR("bzip2",".bz2","bzip2","-6","-d",300)
+#ifdef HAVE_BZ2
+       else
+               APT_ADD_COMPRESSOR("bzip2",".bz2","false", nullptr, nullptr, 300)
+#endif
+       if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->Find("Dir::Bin::lzma")) == true)
+               APT_ADD_COMPRESSOR("lzma",".lzma","lzma","-6","-d",400)
+#ifdef HAVE_LZMA
+       else
+               APT_ADD_COMPRESSOR("lzma",".lzma","false", nullptr, nullptr, 400)
+#endif
+
+       std::vector<std::string> const comp = _config->FindVector("APT::Compressor", "", true);
+       for (auto const &c: comp)
+       {
+               if (c.empty() || std::find(CompressorsDone.begin(), CompressorsDone.end(), c) != CompressorsDone.end())
                        continue;
-               compressors.push_back(Compressor(c->c_str(), std::string(".").append(*c).c_str(), c->c_str(), "-9", "-d", 100));
+               compressors.push_back(Compressor(c.c_str(), std::string(".").append(c).c_str(), c.c_str(), nullptr, nullptr, 1000));
        }
 
        return compressors;
@@ -441,7 +431,7 @@ Configuration::Compressor::Compressor(char const *name, char const *extension,
                                      char const *binary,
                                      char const *compressArg, char const *uncompressArg,
                                      unsigned short const cost) {
-       std::string const config = std::string("APT:Compressor::").append(name).append("::");
+       std::string const config = std::string("APT::Compressor::").append(name).append("::");
        Name = _config->Find(std::string(config).append("Name"), name);
        Extension = _config->Find(std::string(config).append("Extension"), extension);
        Binary = _config->Find(std::string(config).append("Binary"), binary);
@@ -458,4 +448,28 @@ Configuration::Compressor::Compressor(char const *name, char const *extension,
                UncompressArgs.push_back(uncompressArg);
 }
                                                                        /*}}}*/
+// getBuildProfiles - return a vector of enabled build profiles                /*{{{*/
+std::vector<std::string> const Configuration::getBuildProfiles() {
+       // order is: override value (~= commandline), environment variable, list (~= config file)
+       std::string profiles_env = getenv("DEB_BUILD_PROFILES") == 0 ? "" : getenv("DEB_BUILD_PROFILES");
+       if (profiles_env.empty() == false) {
+               profiles_env = SubstVar(profiles_env, " ", ",");
+               std::string const bp = _config->Find("APT::Build-Profiles");
+               _config->Clear("APT::Build-Profiles");
+               if (bp.empty() == false)
+                       _config->Set("APT::Build-Profiles", bp);
+       }
+       return _config->FindVector("APT::Build-Profiles", profiles_env);
+}
+std::string const Configuration::getBuildProfilesString() {
+       std::vector<std::string> profiles = getBuildProfiles();
+       if (profiles.empty() == true)
+               return "";
+       std::vector<std::string>::const_iterator p = profiles.begin();
+       std::string list = *p;
+       for (++p; p != profiles.end(); ++p)
+          list.append(",").append(*p);
+       return list;
+}
+                                                                       /*}}}*/
 }