From d37ad048732fbcef38aec001993553896dbe4198 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Sun, 15 Oct 2006 19:31:03 +0000 Subject: Merged frugalware changes (too many to list). Also added some config file handling changes (support [sections] to carry over to included files - this helps with backwards compatibility with existing pacman config files) --- lib/libalpm/handle.h | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'lib/libalpm/handle.h') diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 7819bfad..b50e5800 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -47,15 +47,24 @@ typedef struct __pmhandle_t { PMList *noupgrade; /* List of strings */ PMList *noextract; /* List of strings */ PMList *ignorepkg; /* List of strings */ + PMList *holdpkg; /* List of strings */ unsigned char usesyslog; + time_t upgradedelay; + /* servers */ + char *proxyhost; + unsigned short proxyport; + char *xfercommand; + unsigned short nopassiveftp; + unsigned short chomp; /* if eye-candy features should be enabled or not */ + PMList *needles; /* for searching */ } pmhandle_t; -#define FREEHANDLE(p) do { if (p) { handle_free(p); p = NULL; } } while (0) +#define FREEHANDLE(p) do { if (p) { _alpm_handle_free(p); p = NULL; } } while (0) -pmhandle_t *handle_new(void); -int handle_free(pmhandle_t *handle); -int handle_set_option(pmhandle_t *handle, unsigned char val, unsigned long data); -int handle_get_option(pmhandle_t *handle, unsigned char val, long *data); +pmhandle_t *_alpm_handle_new(void); +int _alpm_handle_free(pmhandle_t *handle); +int _alpm_handle_set_option(pmhandle_t *handle, unsigned char val, unsigned long data); +int _alpm_handle_get_option(pmhandle_t *handle, unsigned char val, long *data); #endif /* _ALPM_HANDLE_H */ -- cgit v1.2.3-24-g4f1b