summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib/configuration.cc
AgeCommit message (Collapse)Author
2017-07-12Reformat and sort all includes with clang-formatJulian Andres Klode
This makes it easier to see which headers includes what. The changes were done by running git grep -l '#\s*include' \ | grep -E '.(cc|h)$' \ | xargs sed -i -E 's/(^\s*)#(\s*)include/\1#\2 include/' To modify all include lines by adding a space, and then running ./git-clang-format.sh.
2017-01-27avoid malloc if option whitelist is disabled (default)David Kalnischkies
Config options are checked in various paths, so making "useless" memory allocations wastes time and can also cause problems like #852757. The unneeded malloc was added in ae73a2944a89e0d2406a2aab4a4c082e1e9da3f9. (We have no explicit malloc here – its std:string doing this internally)
2017-01-19fix various typos reported by spellintianDavid Kalnischkies
Most of them in (old) code comments. The two instances of user visible string changes the po files of the manpages are fixed up as well. Gbp-Dch: Ignore Reported-By: spellintian
2016-12-31allow warning generation for non-whitelisted optionsDavid Kalnischkies
The idea is simple: Each¹ Find*( call starts with a call check if the given option (with the requested type) exists in the whitelist. The whitelist is specified via our configure-index file so that we have a better chance at keeping it current. the whitelist is loaded via a special (undocumented for now) configuration stanza and if none is loaded the empty whitelist will make it so that no warnings are shown. Much needs to be done still, but that is as good a time as any to take a snapshot of the current state and release it into the wild given that it found some bugs already and has no practical effect on users. ¹ not all in this iteration, but many
2016-07-19ensure Cnf::FindFile doesn't return files below /dev/nullDavid Kalnischkies
Very unlikely, but if the parent is /dev/null, the child empty and the grandchild a value we returned /dev/null/value which doesn't exist, so hardly a problem, but for best operability we should be consistent in our work and return /dev/null always.
2016-05-03remove 100-levels config nesting limitDavid Kalnischkies
The actual reason for this commit isn't the limit – there isn't much point in using that much nesting – its in shutting up gcc mostly: apt/apt-pkg/contrib/configuration.cc: In function ‘bool ReadConfigFile(Configuration&, const string&, const bool&, const unsigned int&)’: apt/apt-pkg/contrib/configuration.cc:686:20: warning: cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations] string Stack[100]; ^ by replacing this with C++s handy std::stack container (adapter). Also cleans some whitespace noise from the file in the process.
2015-11-04add binary-specific options via Binary scopeDavid Kalnischkies
Especially with apt now, it can be useful to set an option only for apt and not for apt-get. Using a binary-specific subtree which is merged into the root seems like a simple enough trick to achieve this.
2015-08-10remove the compatibility markers for 4.13 abiDavid Kalnischkies
We aren't and we will not be really compatible again with the previous stable abi, so lets drop these markers (which never made it into a released version) for good as they have outlived their intend already. Git-Dch: Ignore
2015-06-09configureable acquire targets to download additional filesDavid Kalnischkies
First pass at making the acquire system capable of downloading files based on configuration rather than hardcoded entries. It is now possible to instruct 'deb' and 'deb-src' sources.list lines to download more than just Packages/Translation-* and Sources files. Details on how to do that can be found in the included documentation file.
2015-03-16fix some new compiler warnings reported by gcc-5David Kalnischkies
Git-Dch: Ignore
2014-11-08explicit overload methods instead of adding parametersDavid Kalnischkies
Adding a new parameter (with a default) is an ABI break, but you can overload a method, which is "just" an API break for everyone doing references to this method (aka: nobody). Git-Dch: Ignore
2014-09-29fix Configuration::FindVector APIDavid Kalnischkies
Git-Dch: Ignore
2014-05-07fix some compile errors in the now enabled #if (APT_PKG_MAJOR >= 4 && ↵Michael Vogt
APT_PKG_MINOR < 13)
2014-03-13cleanup headers and especially #includes everywhereDavid Kalnischkies
Beside being a bit cleaner it hopefully also resolves oddball problems I have with high levels of parallel jobs. Git-Dch: Ignore Reported-By: iwyu (include-what-you-use)
2014-03-13warning: extra ‘;’ [-Wpedantic]David Kalnischkies
Git-Dch: Ignore Reported-By: gcc -Wpedantic
2014-03-13add default and override handling for Cnf::FindVectorDavid Kalnischkies
Automatically handle the override of list options via its parent value which can even be a comma-separated list of values. It also adds an easy way of providing a default for the list.
2013-08-15* lp:~mvo/apt/config-clear:Michael Vogt
- support Configuration.Clear() for a clear of the entire configuration Conflicts: debian/changelog
2013-07-25fix off-by-one error and do not use magic constant of 100 when checking ↵Michael Vogt
StackPost
2013-03-10various simple changes to fix cppcheck warningsDavid Kalnischkies
2012-04-23/dev/null is a special absolute path as it has no subdirectoriesDavid Kalnischkies
2012-04-23normalize a bit by replacing // and /./ with / in FindFileDavid Kalnischkies
2012-04-22* apt-pkg/contrib/configuration.cc:David Kalnischkies
- add a more versatile Dump() method
2012-01-30* apt-pkg/contrib/configuration.cc:David Kalnischkies
- do not stop parent transversal in FindDir if the value is empty See http://lists.debian.org/deity/2012/01/msg00053.html , too.
2011-10-05* apt-pkg/contrib/configuration.cc:Michael Vogt
- fix double delete (LP: #848907) - ignore only the invalid regexp instead of all options * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc: - fix fetching language information by adding OptionalSubIndexTarget * methods/https.cc: - cleanup broken downloads properly * ftparchive/cachedb.cc: - fix buffersize in bytes2hex * apt-pkg/deb/deblistparser.cc: - fix crash when the dynamic mmap needs to be grown in LoadReleaseInfo (LP: #854090)
2011-09-13merge with debian/experimentalDavid Kalnischkies
2011-09-13* apt-pkg/contrib/configuration.cc:Michael Vogt
- fix double delete (LP: #848907) - ignore only the invalid regexp instead of all options
2011-09-13reorder includes: add <config.h> if needed and include it at firstDavid Kalnischkies
2011-08-11cppcheck complains about some possible speed improvements which could beDavid Kalnischkies
done on the mirco-optimazation level, so lets fix them: (performance) Possible inefficient checking for emptiness. (performance) Prefer prefix ++/-- operators for non-primitive types.
2011-07-15apt-pkg/contrib/configuration.cc: revert Configuration::Set() ABI breakMichael Vogt
2011-07-06* apt-pkg/init.cc:David Kalnischkies
- use CndSet in pkgInitConfig (Closes: #629617)
2010-08-28* apt-pkg/contrib/configuration.cc:David Kalnischkies
- fix autoremove by using correct config-option name and don't make faulty assumptions in error handling (Closes: #594689)
2010-06-26 - use the new MatchAgainstConfig for the DefaultRootSetFuncDavid Kalnischkies
* apt-pkg/contrib/configuration.{cc,h}: - add a wrapper to match strings against configurable regex patterns
2010-04-24* apt-pkg/contrib/configuration.cc:David Kalnischkies
- error out if #clear directive has no argument
2010-01-16Fix the newly introduced method GetListOfFilesInDir to not accept everyDavid Kalnischkies
file if no extension is enforced (= restore old behaviour). (Closes: #565213) This commit includes also: * apt-pkg/policy.cc: - accept also partfiles with "pref" file extension as valid * apt-pkg/contrib/configuration.cc: - accept also partfiles with "conf" file extension as valid * doc/apt.conf.5.xml: - reorder description and split out syntax - add partfile name convention (Closes: #558348) * doc/apt_preferences.conf.5.xml: - describe partfile name convention also here And a lovely test application of course.
2010-01-13merge with lp:~mvo/apt/debian-sid to get 0.7.25.1 and my changes backDavid Kalnischkies
2010-01-08fix merge errorMichael Vogt
2010-01-08* French manpage translation updateMichael Vogt
* spot & fix various typos in all manpages * German manpage translation update * cmdline/apt-cache.cc: - remove translatable marker from the "%4i %s\n" string * buildlib/po4a_manpage.mak: - instruct debiandoc to build files with utf-8 encoding * buildlib/tools.m4: - fix some warning from the buildtools * apt-pkg/acquire-item.cc: - add configuration PDiffs::Limit-options to not download too many or too big patches (Closes: #554349) * debian/control: - let all packages depend on ${misc:Depends} * share/*-archive.gpg: - remove the horrible outdated files. We already depend on the keyring so we don't need to ship our own version * cmdline/apt-key: - errors out if wget is not installed (Closes: #545754) - add --keyring option as we have now possibly many * methods/gpgv.cc: - pass all keyrings (TrustedParts) to gpgv instead of using only one trusted.gpg keyring (Closes: #304846) * methods/https.cc: - finally merge the rest of the patchset from Arnaud Ebalard with the CRL and Issuers options, thanks! (Closes: #485963)
2010-01-03Add a GetListOfFilesInDir() helper method which replaces the oldDavid Kalnischkies
code copies used to load the various parts-files
2009-11-25another round of method hardening with const& in ConfigurationDavid Kalnischkies
2009-09-07reintroduce #clear and #include in the config files,David Kalnischkies
they there broken since 0.7.21 with the introduction of #-comments
2009-09-04add a helper to easily get a vector of strings from the configurationDavid Kalnischkies
2009-06-12apt-pkg/contrib/configuration.cc: Fix a small memory leak inJulian Andres Klode
ReadConfigFile.
2009-06-09[ABI break] support '#' in apt.conf and /etc/apt/preferencesMichael Vogt
(closes: #189866)
2009-03-06Fix FindFile (and FindDir) so that the value of RootDir is applied to the ↵Daniel Burrows
default if no value is found. Previously FindFile("Dir::etc", "/etc") would use RootDir if a value existed for "Dir::etc"; otherwise it would go ahead and use "/etc", ignoring RootDir. Of course, this made RootDir fairly useless; it has now been fixed.
2008-04-01Improve the names used for the non-whitespace iterators.Daniel Burrows
2008-04-01Remove a debugging message that I left in by accident (if it ever triggers ↵Daniel Burrows
the program is about to crash anyway).
2008-04-01Improve some comments in the configuration parser.Daniel Burrows
2008-04-01Lift the 1024-character limit on configuration file lines.Daniel Burrows
To do this, I changed the configuration parser so that instead of reading the line into a buffer and munging it in-place, it builds a string containing the current line (via successive getline() calls) and then walks down that string. Instead of skipping comments and whitespace by erasing them from the buffer, the new code just skips over them.
2008-03-31When a line in a config file is too long, say which config file it is.Daniel Burrows
2007-12-27* Fix compilation warnings in apt-pkg/cdrom.cc andOtavio Salvador
apt-pkg/contrib/configuration.cc.