Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / deb / debindexfile.cc

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index f9864c67bc33df58c3d7e5b56a3969416ac73569..c1c2b726a11d900fb25ebe6ac665b4040af96460 100644 (file)
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -526,7 +526,7 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
    if (FileExists(TranslationFile))
    {
      FileFd Trans(TranslationFile,FileFd::ReadOnly, FileFd::Extension);
-     debListParser TransParser(&Trans);
+     debTranslationsParser TransParser(&Trans);
      if (_error->PendingError() == true)
        return false;
      
@@ -619,7 +619,7 @@ bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
    pkgCache::PkgFileIterator CFile = Gen.GetCurFile();
    CFile->Size = Pkg.FileSize();
    CFile->mtime = Pkg.ModificationTime();
-   map_ptrloc const storage = Gen.WriteUniqString("now");
+   map_stringitem_t const storage = Gen.WriteUniqString("now");
    CFile->Archive = storage;
    
    if (Gen.MergeList(Parser) == false)
@@ -673,8 +673,7 @@ APT_CONST bool debStatusIndex::Exists() const
 debDebPkgFileIndex::debDebPkgFileIndex(std::string DebFile)
    : pkgIndexFile(true), DebFile(DebFile)
 {
-   // FIXME: we need to os.normpath(DebFile) here, this is a lame workaround
-   DebFileFullPath = SafeGetCWD() + DebFile;
+   DebFileFullPath = flAbsPath(DebFile);
 }
 
 std::string debDebPkgFileIndex::ArchiveURI(std::string /*File*/) const
@@ -693,18 +692,22 @@ bool debDebPkgFileIndex::Merge(pkgCacheGenerator& Gen, OpProgress* Prog) const
 
    // get the control data out of the deb file vid dpkg -I
    // ... can I haz libdpkg?
-   string cmd;
-   // FIXME: shell injection
-   strprintf(cmd, "dpkg -I %s control", DebFile.c_str());
-   FILE *p = popen(cmd.c_str(), "r");
-   if (p == NULL)
-      return _error->Error("popen failed");
+   std::string dpkg = _config->Find("Dir::Bin::dpkg","dpkg");
+   const char *Args[5] = {dpkg.c_str(),
+                          "-I",
+                          DebFile.c_str(),
+                          "control",
+                          NULL};
+   FileFd PipeFd;
+   pid_t Child;
+   if(Popen(Args, PipeFd, Child, FileFd::ReadOnly) == false)
+      return _error->Error("Popen failed");
    // FIXME: static buffer
    char buf[8*1024];
-   size_t n = fread(buf, 1, sizeof(buf)-1, p);
-   if (n == 0)
-      return _error->Errno("popen", "Failed to read dpkg pipe");
-   pclose(p);
+   unsigned long long n = 0;
+   if(PipeFd.Read(buf, sizeof(buf)-1, &n) == false)
+      return _error->Errno("read", "Failed to read dpkg pipe");
+   ExecWait(Child, "Popen");
 
    // now write the control data to a tempfile
    SPtr<FileFd> DebControl = GetTempFile("deb-file-" + DebFile);
@@ -757,6 +760,41 @@ unsigned long debDebPkgFileIndex::Size() const
 }
                                                                        /*}}}*/
 
+// debDscFileIndex stuff
+debDscFileIndex::debDscFileIndex(std::string &DscFile) 
+   : pkgIndexFile(true), DscFile(DscFile)
+{
+}
+
+bool debDscFileIndex::Exists() const
+{
+   return FileExists(DscFile);
+}
+
+unsigned long debDscFileIndex::Size() const
+{
+   struct stat buf;
+   if(stat(DscFile.c_str(), &buf) == 0)
+      return buf.st_size;
+   return 0;
+}
+
+// DscFileIndex::CreateSrcParser - Get a parser for the .dsc file      /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+pkgSrcRecords::Parser *debDscFileIndex::CreateSrcParser() const
+{
+   if (!FileExists(DscFile))
+      return NULL;
+
+   return new debDscRecordParser(DscFile,this);
+}
+                                                                       /*}}}*/
+
+
+
+
+// ---------------------------------------------------------------------
 // Index File types for Debian                                         /*{{{*/
 class debIFTypeSrc : public pkgIndexFile::Type
 {
@@ -798,11 +836,33 @@ class debIFTypeDebPkgFile : public pkgIndexFile::Type
    };
    debIFTypeDebPkgFile() {Label = "deb Package file";};
 };
+class debIFTypeDscFile : public pkgIndexFile::Type
+{
+   public:
+   virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string DscFile) const
+   {
+      return new debDscRecordParser(DscFile, NULL);
+   };
+   debIFTypeDscFile() {Label = "dsc File Source Index";};
+};
+class debIFTypeDebianSourceDir : public pkgIndexFile::Type
+{
+   public:
+   virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string SourceDir) const
+   {
+      return new debDscRecordParser(SourceDir + string("/debian/control"), NULL);
+   };
+   debIFTypeDebianSourceDir() {Label = "debian/control File Source Index";};
+};
+
 static debIFTypeSrc _apt_Src;
 static debIFTypePkg _apt_Pkg;
 static debIFTypeTrans _apt_Trans;
 static debIFTypeStatus _apt_Status;
 static debIFTypeDebPkgFile _apt_DebPkgFile;
+// file based pseudo indexes
+static debIFTypeDscFile _apt_DscFile;
+static debIFTypeDebianSourceDir _apt_DebianSourceDir;
 
 const pkgIndexFile::Type *debSourcesIndex::GetType() const
 {
@@ -823,5 +883,13 @@ const pkgIndexFile::Type *debStatusIndex::GetType() const
 const pkgIndexFile::Type *debDebPkgFileIndex::GetType() const
 {
    return &_apt_DebPkgFile;
+}
+const pkgIndexFile::Type *debDscFileIndex::GetType() const
+{
+   return &_apt_DscFile;
+}
+const pkgIndexFile::Type *debDebianSourceDirIndex::GetType() const
+{
+   return &_apt_DebianSourceDir;
 }
                                                                        /*}}}*/