summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2013-03-15 14:29:46 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2013-03-15 14:29:46 +0100
commit99ed26d32226f0dffe5a37fb78c5588f9d9ecfd5 (patch)
treed45910c553d7443d046d976941859a7e8f362f5d /apt-pkg/contrib
parent2f5b615169aef2d9c74bb337af229dee2dce595e (diff)
* apt-pkg/contrib/gpgv.cc:
- ExecGPGV is a method which should never return, so mark it as such and fix the inconsistency of returning in error cases
Diffstat (limited to 'apt-pkg/contrib')
-rw-r--r--apt-pkg/contrib/gpgv.cc22
-rw-r--r--apt-pkg/contrib/gpgv.h26
2 files changed, 36 insertions, 12 deletions
diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc
index 9b008dd4f..9760bd21f 100644
--- a/apt-pkg/contrib/gpgv.cc
+++ b/apt-pkg/contrib/gpgv.cc
@@ -25,20 +25,28 @@ using namespace std;
// ---------------------------------------------------------------------
/* Generating the commandline for calling gpgv is somehow complicated as
we need to add multiple keyrings and user supplied options. */
-bool ExecGPGV(std::string const &File, std::string const &FileGPG,
+void ExecGPGV(std::string const &File, std::string const &FileGPG,
int const &statusfd, int fd[2])
{
+ #define EINTERNAL 111
+
if (File == FileGPG)
{
#define SIGMSG "-----BEGIN PGP SIGNED MESSAGE-----\n"
char buffer[sizeof(SIGMSG)];
FILE* gpg = fopen(File.c_str(), "r");
if (gpg == NULL)
- return _error->Errno("RunGPGV", _("Could not open file %s"), File.c_str());
+ {
+ ioprintf(std::cerr, _("Could not open file %s"), File.c_str());
+ exit(EINTERNAL);
+ }
char const * const test = fgets(buffer, sizeof(buffer), gpg);
fclose(gpg);
if (test == NULL || strcmp(buffer, SIGMSG) != 0)
- return _error->Error(_("File %s doesn't start with a clearsigned message"), File.c_str());
+ {
+ ioprintf(std::cerr, _("File %s doesn't start with a clearsigned message"), File.c_str());
+ exit(EINTERNAL);
+ }
#undef SIGMSG
}
@@ -69,8 +77,9 @@ bool ExecGPGV(std::string const &File, std::string const &FileGPG,
if (keyrings.empty() == true)
{
// TRANSLATOR: %s is the trusted keyring parts directory
- return _error->Error(_("No keyring installed in %s."),
- _config->FindDir("Dir::Etc::TrustedParts").c_str());
+ ioprintf(std::cerr, _("No keyring installed in %s."),
+ _config->FindDir("Dir::Etc::TrustedParts").c_str());
+ exit(EINTERNAL);
}
Args.push_back(gpgvpath.c_str());
@@ -133,6 +142,7 @@ bool ExecGPGV(std::string const &File, std::string const &FileGPG,
}
execvp(gpgvpath.c_str(), (char **) &Args[0]);
- return true;
+ ioprintf(std::cerr, "Couldn't execute %s to check %s", Args[0], File.c_str());
+ exit(EINTERNAL);
}
/*}}}*/
diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h
index c15166c94..8aeea2fb3 100644
--- a/apt-pkg/contrib/gpgv.h
+++ b/apt-pkg/contrib/gpgv.h
@@ -11,14 +11,28 @@
#include <string>
-/** \brief generates and run the command to verify a file with gpgv */
-bool ExecGPGV(std::string const &File, std::string const &FileOut,
- int const &statusfd, int fd[2]);
+#if __GNUC__ >= 4
+ #define APT_noreturn __attribute__ ((noreturn))
+#else
+ #define APT_noreturn /* no support */
+#endif
-inline bool ExecGPGV(std::string const &File, std::string const &FileOut,
+/** \brief generates and run the command to verify a file with gpgv
+ *
+ * If File and FileSig specify the same file it is assumed that we
+ * deal with a clear-signed message.
+ *
+ * @param File is the message (unsigned or clear-signed)
+ * @param FileSig is the signature (detached or clear-signed)
+ */
+void ExecGPGV(std::string const &File, std::string const &FileSig,
+ int const &statusfd, int fd[2]) APT_noreturn;
+inline void ExecGPGV(std::string const &File, std::string const &FileSig,
int const &statusfd = -1) {
int fd[2];
- return ExecGPGV(File, FileOut, statusfd, fd);
-}
+ ExecGPGV(File, FileSig, statusfd, fd);
+};
+
+#undef APT_noreturn
#endif