Merge remote-tracking branch 'mvo/feature/srcrec-enum2' into debian/sid

[apt.git] / apt-pkg / contrib / gpgv.cc

diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc
index f57a72d8640fe099c451357eb39ba52aaaaf7327..f24dd964018852d7cf23dd0675250d209fe09e56 100644 (file)
--- a/apt-pkg/contrib/gpgv.cc
+++ b/apt-pkg/contrib/gpgv.cc
@@ -2,21 +2,23 @@
 // Include Files                                                       /*{{{*/
 #include<config.h>
 
 // Include Files                                                       /*{{{*/
 #include<config.h>
 

+#include<apt-pkg/configuration.h>
+#include<apt-pkg/error.h>
+#include<apt-pkg/strutl.h>
+#include<apt-pkg/fileutl.h>
+#include<apt-pkg/gpgv.h>
+

 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <fcntl.h>

-#include <sys/stat.h>
-#include <sys/types.h>

 #include <sys/wait.h>
 #include <unistd.h>
 #include <sys/wait.h>
 #include <unistd.h>

-
-#include<apt-pkg/configuration.h>
-#include<apt-pkg/error.h>
-#include<apt-pkg/strutl.h>
-#include<apt-pkg/fileutl.h>
-#include<apt-pkg/gpgv.h>
+#include <stddef.h>
+#include <iostream>
+#include <string>
+#include <vector>

 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/


@@ -103,12 +105,12 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
       }
    }
 
       }
    }
 

+   enum  { DETACHED, CLEARSIGNED } releaseSignature = (FileGPG != File) ? DETACHED : CLEARSIGNED;

    std::vector<std::string> dataHeader;
    char * sig = NULL;
    char * data = NULL;
 
    std::vector<std::string> dataHeader;
    char * sig = NULL;
    char * data = NULL;
 

-   // file with detached signature
-   if (FileGPG != File)
+   if (releaseSignature == DETACHED)

    {
       Args.push_back(FileGPG.c_str());
       Args.push_back(File.c_str());
    {
       Args.push_back(FileGPG.c_str());
       Args.push_back(File.c_str());


@@ -181,7 +183,7 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
       putenv((char *)"LC_MESSAGES=");
    }
 
       putenv((char *)"LC_MESSAGES=");
    }
 

-   if (FileGPG != File)
+   if (releaseSignature == DETACHED)

    {
       execvp(gpgvpath.c_str(), (char **) &Args[0]);
       ioprintf(std::cerr, "Couldn't execute %s to check %s", Args[0], File.c_str());
    {
       execvp(gpgvpath.c_str(), (char **) &Args[0]);
       ioprintf(std::cerr, "Couldn't execute %s to check %s", Args[0], File.c_str());


@@ -260,8 +262,7 @@ bool SplitClearSignedFile(std::string const &InFile, FileFd * const ContentFile,
 
    char *buf = NULL;
    size_t buf_size = 0;
 
    char *buf = NULL;
    size_t buf_size = 0;

-   ssize_t line_len = 0;
-   while ((line_len = getline(&buf, &buf_size, in)) != -1)
+   while (getline(&buf, &buf_size, in) != -1)

    {
       _strrstrip(buf);
       if (found_message_start == false)
    {
       _strrstrip(buf);
       if (found_message_start == false)


@@ -355,7 +356,7 @@ bool OpenMaybeClearSignedFile(std::string const &ClearSignedFileName, FileFd &Me
       return _error->Error("Couldn't open temporary file to work with %s", ClearSignedFileName.c_str());
 
    _error->PushToStack();
       return _error->Error("Couldn't open temporary file to work with %s", ClearSignedFileName.c_str());
 
    _error->PushToStack();

-   bool const splitDone = SplitClearSignedFile(ClearSignedFileName.c_str(), &MessageFile, NULL, NULL);
+   bool const splitDone = SplitClearSignedFile(ClearSignedFileName, &MessageFile, NULL, NULL);

    bool const errorDone = _error->PendingError();
    _error->MergeWithStack();
    if (splitDone == false)
    bool const errorDone = _error->PendingError();
    _error->MergeWithStack();
    if (splitDone == false)