Introduce isspace_ascii() for use by parsers

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

diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h
index 08b10a97ac123c44d6555281c46710fc48cdd2a9..2a4cdad72f7a6aa4372c252559dd66b94d725194 100644 (file)
--- a/apt-pkg/contrib/gpgv.h
+++ b/apt-pkg/contrib/gpgv.h
@@ -9,36 +9,46 @@
 #ifndef CONTRIB_GPGV_H
 #define CONTRIB_GPGV_H
 
 #ifndef CONTRIB_GPGV_H
 #define CONTRIB_GPGV_H
 

+#include <apt-pkg/macros.h>
+

 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

+#ifndef APT_10_CLEANER_HEADERS

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/fileutl.h>

-
-#if __GNUC__ >= 4
-       #define APT_noreturn    __attribute__ ((noreturn))
-#else
-       #define APT_noreturn    /* no support */

 #endif
 
 #endif
 

+class FileFd;
+

 /** \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
 /** \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. In that case the file will be
- * rewritten to be in a good-known format without uneeded whitespaces
- * and additional messages (unsigned or signed).
+ * deal with a clear-signed message. Note that the method will accept
+ * and validate files which include additional (unsigned) messages
+ * without complaining. Do NOT open files accepted by this method
+ * for reading. Use #OpenMaybeClearSignedFile to access the message
+ * instead to ensure you are only reading signed data.
+ *
+ * The method does not return, but has some notable exit-codes:
+ * 111 signals an internal error like the inability to execute gpgv,
+ * 112 indicates a clear-signed file which doesn't include a message,
+ *  which can happen if APT is run while on a network requiring
+ *  authentication before usage (e.g. in hotels)
+ * All other exit-codes are passed-through from gpgv.

  *
  * @param File is the message (unsigned or clear-signed)
  * @param FileSig is the signature (detached or clear-signed)
  *
  * @param File is the message (unsigned or clear-signed)
  * @param FileSig is the signature (detached or clear-signed)

+ * @param statusfd is the fd given to gpgv as --status-fd
+ * @param fd is used as a pipe for the standard output of gpgv
+ * @param key is the specific one to be used instead of using all

  */
 void ExecGPGV(std::string const &File, std::string const &FileSig,
  */
 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, int fd[2], std::string const &Key = "") APT_NORETURN;
+inline APT_NORETURN void ExecGPGV(std::string const &File, std::string const &FileSig,

       int const &statusfd = -1) {
    int fd[2];
    ExecGPGV(File, FileSig, statusfd, fd);
       int const &statusfd = -1) {
    int fd[2];
    ExecGPGV(File, FileSig, statusfd, fd);

-};
-
-#undef APT_noreturn
+}

 
 /** \brief Split an inline signature into message and signature
  *
 
 /** \brief Split an inline signature into message and signature
  *