Merge branch 'debian/sid' into ubuntu/master1.0.4ubuntu1

Conflicts:
	configure.ac
	debian/changelog

1 files changed, 47 insertions, 0 deletions

diff --git a/ftparchive/sources.cc b/ftparchive/sources.cc
new file mode 100644
index 000000000..d0878a70a
--- /dev/null
+++ b/ftparchive/sources.cc
@@ -0,0 +1,47 @@
+#include <string>
+#include <iostream>
+
+// for memcpy
+#include <cstring>
+
+#include <apt-pkg/error.h>
+#include <apt-pkg/gpgv.h>
+
+#include "sources.h"
+
+bool DscExtract::TakeDsc(const void *newData, unsigned long newSize)
+{
+   if(newSize > maxSize)
+     return _error->Error("DSC data is too large %lu!", newSize);
+
+   if (newSize == 0)
+   {
+      Length = 0;
+      return true;
+   }
+   memcpy(Data, newData, newSize);
+   Length = newSize;
+
+   return true;
+}
+
+bool DscExtract::Read(std::string FileName)
+{
+   FileFd F;
+   if (OpenMaybeClearSignedFile(FileName, F) == false)
+      return false;
+   
+   unsigned long long const FSize = F.FileSize();
+   if(FSize > maxSize)
+     return _error->Error("DSC file '%s' is too large!",FileName.c_str());
+
+   if (F.Read(Data, FSize) == false)
+      return false;
+   Length = FSize;
+
+   IsClearSigned = (FileName != F.Name());
+
+   return true;
+}
+
+