tests: don't do boundless string compares with data()

[apt.git] / apt-pkg / clean.cc

diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc
index eae419e34679cb1947dda443642bbac3e3cedcc9..fe57c26a2287da6015394321a857242b753e27c6 100644 (file)
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -16,7 +16,11 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
+#include <string>
+#include <string.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -30,7 +34,15 @@
 bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
 {
    bool CleanInstalled = _config->FindB("APT::Clean-Installed",true);
-      
+
+   if(Dir == "/")
+      return _error->Error(_("Clean of %s is not supported"), Dir.c_str());
+
+   // non-existing directories are always clean
+   // we do not check for a directory explicitly to support symlinks
+   if (FileExists(Dir) == false)
+      return true;
+
    DIR *D = opendir(Dir.c_str());
    if (D == 0)
       return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
@@ -47,6 +59,7 @@ bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
       // Skip some files..
       if (strcmp(Dir->d_name,"lock") == 0 ||
          strcmp(Dir->d_name,"partial") == 0 ||
+         strcmp(Dir->d_name,"lost+found") == 0 ||
          strcmp(Dir->d_name,".") == 0 ||
          strcmp(Dir->d_name,"..") == 0)
         continue;
@@ -99,13 +112,13 @@ bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
                 J.end() == false; ++J)
            {
               if (CleanInstalled == true &&
-                  (J.File()->Flags & pkgCache::Flag::NotSource) != 0)
+                  J.File().Flagged(pkgCache::Flag::NotSource))
                  continue;
               IsFetchable = true;
               break;
            }
            
-           // See if this verison matches the file
+           // See if this version matches the file
            if (IsFetchable == true && Ver == V.VerStr())
               break;
         }
@@ -124,3 +137,6 @@ bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
    return true;
 }
                                                                        /*}}}*/
+
+pkgArchiveCleaner::pkgArchiveCleaner() : d(NULL) {}
+APT_CONST pkgArchiveCleaner::~pkgArchiveCleaner() {}