1 files changed, 23 insertions, 11 deletions

diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h
index 2d962fe6..bace8052 100644
--- a/lib/libalpm/handle.h
+++ b/lib/libalpm/handle.h
@@ -24,12 +24,13 @@
 #include <sys/types.h>
 
 #include "alpm_list.h"
-#include "db.h"
-#include "log.h"
 #include "alpm.h"
-#include "trans.h"
 
-typedef struct _pmhandle_t {
+#ifdef HAVE_LIBCURL
+#include <curl/curl.h>
+#endif
+
+struct __pmhandle_t {
 	/* internal usage */
 	pmdb_t *db_local;       /* local db pointer */
 	alpm_list_t *dbs_sync;  /* List of (pmdb_t *) */
@@ -37,6 +38,12 @@ typedef struct _pmhandle_t {
 	FILE *lckstream;        /* lock file stream pointer if one exists */
 	pmtrans_t *trans;
 
+#ifdef HAVE_LIBCURL
+	/* libcurl handle */
+	CURL *curl;             /* reusable curl_easy handle */
+	CURLcode curlerr;       /* last error produced by curl */
+#endif
+
 	/* callback functions */
 	alpm_cb_log logcb;      /* Log callback function */
 	alpm_cb_download dlcb;  /* Download callback function */
@@ -48,6 +55,7 @@ typedef struct _pmhandle_t {
 	char *dbpath;            /* Base path to pacman's DBs */
 	char *logfile;           /* Name of the log file */
 	char *lockfile;          /* Name of the lock file */
+	char *signaturedir;        /* Directory where GnuPG files are stored */
 	alpm_list_t *cachedirs;  /* Paths to pacman cache directories */
 
 	/* package lists */
@@ -57,18 +65,22 @@ typedef struct _pmhandle_t {
 	alpm_list_t *ignoregrp;   /* List of groups to ignore */
 
 	/* options */
-	int usesyslog;    /* Use syslog instead of logfile? */ /* TODO move to frontend */
-	char *arch;       /* Architecture of packages we should allow */
-	int usedelta;     /* Download deltas if possible */
-	int checkspace;   /* Check disk space before installing */
-} pmhandle_t;
+	int usesyslog;           /* Use syslog instead of logfile? */ /* TODO move to frontend */
+	char *arch;              /* Architecture of packages we should allow */
+	int usedelta;            /* Download deltas if possible */
+	int checkspace;          /* Check disk space before installing */
+	pgp_verify_t sigverify;  /* Default signature verification level */
 
-/* global handle variable */
-extern pmhandle_t *handle;
+	/* error code */
+	enum _pmerrno_t pm_errno;
+};
 
 pmhandle_t *_alpm_handle_new(void);
 void _alpm_handle_free(pmhandle_t *handle);
 
+enum _pmerrno_t _alpm_set_directory_option(const char *value,
+		char **storage, int must_exist);
+
 #endif /* _ALPM_HANDLE_H */
 
 /* vim: set ts=2 sw=2 noet: */