From e21ba62847687b5dc655b28ef7dd67d6eb7336e2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 2 Jan 2016 13:19:32 +0100 Subject: support comments in debian/control parsing Now (55153bf94ff28a23318e79aa48242244c4d82b3c) that pkgTagFile can be told to deal with all sorts of comments we can use this mode to parse dsc (as by catch) and debian/control files properly even in the wake of multiline fields spliced with comments like Build-Depends. Closes: 806775 --- apt-pkg/deb/debsrcrecords.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'apt-pkg/deb/debsrcrecords.cc') diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index cef7ad10e..cefaf46ac 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -33,8 +33,14 @@ using std::max; using std::string; debSrcRecordParser::debSrcRecordParser(std::string const &File,pkgIndexFile const *Index) - : Parser(Index), d(NULL), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400), - iOffset(0), Buffer(NULL) {} + : Parser(Index), d(NULL), Tags(&Fd), iOffset(0), Buffer(NULL) +{ + if (File.empty() == false) + { + if (Fd.Open(File, FileFd::ReadOnly, FileFd::Extension)) + Tags.Init(&Fd, 102400); + } +} // SrcRecordParser::Binaries - Return the binaries field /*{{{*/ // --------------------------------------------------------------------- @@ -260,7 +266,7 @@ debSrcRecordParser::~debSrcRecordParser() debDscRecordParser::debDscRecordParser(std::string const &DscFile, pkgIndexFile const *Index) - : debSrcRecordParser(DscFile, Index) + : debSrcRecordParser("", Index) { // support clear signed files if (OpenMaybeClearSignedFile(DscFile, Fd) == false) @@ -270,7 +276,7 @@ debDscRecordParser::debDscRecordParser(std::string const &DscFile, pkgIndexFile } // re-init to ensure the updated Fd is used - Tags.Init(&Fd); + Tags.Init(&Fd, pkgTagFile::SUPPORT_COMMENTS); // read the first (and only) record Step(); -- cgit v1.2.3