Don't increase the commandline parameter in the library but in the

application to be really generic.

diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index 7372c909e1603f440a1c183f42bec61896a49cd7..5dbd1a4dfa4322a476d3c980139ee252c0fb052d 100644 (file)
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -79,7 +79,7 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std::
 // FromCommandLine - Return all packages specified on commandline      /*{{{*/
 PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out) {
        PackageSet pkgset;
-       for (const char **I = cmdline + 1; *I != 0; I++) {
+       for (const char **I = cmdline; *I != 0; ++I) {
                PackageSet pset = FromString(Cache, *I, out);
                pkgset.insert(pset.begin(), pset.end());
        }
@@ -105,7 +105,7 @@ PackageSet PackageSet::FromString(pkgCacheFile &Cache, const char * const str, s
 APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline,
                APT::VersionSet::Version const &fallback, std::ostream &out) {
        VersionSet verset;
-       for (const char **I = cmdline + 1; *I != 0; I++) {
+       for (const char **I = cmdline; *I != 0; ++I) {
                std::string pkg = *I;
                std::string ver;
                bool verIsRel = false;

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 005721ddf3b5072910d45989110fd130c00d8b13..e3876d5e01601cb18a296914cdbb843791356736 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -176,7 +176,7 @@ bool UnMet(CommandLine &CmdL)
 bool DumpPackage(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
-   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList);
+   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
 
    for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
    {
@@ -553,7 +553,7 @@ bool Depends(CommandLine &CmdL)
    SPtrArray<unsigned> Colours = new unsigned[Cache->Head().PackageCount];
    memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount);
 
-   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList);
+   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
    for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
       Colours[Pkg->ID] = 1;
 
@@ -644,7 +644,7 @@ bool RDepends(CommandLine &CmdL)
    SPtrArray<unsigned> Colours = new unsigned[Cache->Head().PackageCount];
    memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount);
 
-   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList);
+   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
    for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
       Colours[Pkg->ID] = 1;
 
@@ -1457,7 +1457,7 @@ bool ShowPackage(CommandLine &CmdL)
    pkgCacheFile CacheFile;
    APT::VersionSet::Version const select = _config->FindB("APT::Cache::AllVersions", true) ?
                        APT::VersionSet::ALL : APT::VersionSet::INSTALLED;
-   APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList, select);
+   APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, select);
    for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver)
       if (DisplayRecord(CacheFile, Ver) == false)
         return false;
@@ -1616,7 +1616,7 @@ bool Policy(CommandLine &CmdL)
                (InstalledLessCandidate > 0 ? (InstalledLessCandidate) : 0) - 1;
 
    // Print out detailed information for each package
-   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList);
+   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
    for (APT::PackageSet::const_iterator I = pkgset.begin(); I != pkgset.end(); ++I)
    {
       pkgCache::PkgIterator Pkg = I.Group().FindPkg("any");
@@ -1696,7 +1696,7 @@ bool Madison(CommandLine &CmdL)
    if (_error->PendingError() == true)
       _error->Discard();
 
-   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList);
+   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
    for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
    {
       if (Pkg.end() == false)