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)

1 files changed, 132 insertions, 4 deletions

diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index 9c5d971b..62abf6c1 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -2,6 +2,8 @@
  *  handle.c
  * 
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
+ *  Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
+ *  Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos@frugalware.org>
  * 
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,6 +30,8 @@
 #include <stdarg.h>
 #include <syslog.h>
 #include <libintl.h>
+#include <time.h>
+#include <ftplib.h>
 /* pacman */
 #include "util.h"
 #include "log.h"
@@ -39,9 +43,17 @@
 
 /* log */
 extern alpm_cb_log pm_logcb;
+extern FtpCallback pm_dlcb;
 extern unsigned char pm_logmask;
+/* progress bar */
+extern char *pm_dlfnm;
+extern int *pm_dloffset;
+extern struct timeval *pm_dlt0, *pm_dlt;
+extern float *pm_dlrate;
+extern int *pm_dlxfered1;
+extern unsigned char *pm_dleta_h, *pm_dleta_m, *pm_dleta_s;
 
-pmhandle_t *handle_new()
+pmhandle_t *_alpm_handle_new()
 {
 	pmhandle_t *handle;
 
@@ -84,7 +96,7 @@ pmhandle_t *handle_new()
 	return(handle);
 }
 
-int handle_free(pmhandle_t *handle)
+int _alpm_handle_free(pmhandle_t *handle)
 {
 	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 
@@ -104,20 +116,25 @@ int handle_free(pmhandle_t *handle)
 	FREE(handle->dbpath);
 	FREE(handle->cachedir);
 	FREE(handle->logfile);
+	FREE(handle->proxyhost);
+	FREE(handle->xfercommand);
 	FREELIST(handle->dbs_sync);
 	FREELIST(handle->noupgrade);
 	FREELIST(handle->noextract);
 	FREELIST(handle->ignorepkg);
+	FREELIST(handle->holdpkg);
+	FREELIST(handle->needles);
 	free(handle);
 
 	return(0);
 }
 
-int handle_set_option(pmhandle_t *handle, unsigned char val, unsigned long data)
+int _alpm_handle_set_option(pmhandle_t *handle, unsigned char val, unsigned long data)
 {
 	/* Sanity checks */
 	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 
+	char *p;
 	switch(val) {
 		case PM_OPT_DBPATH:
 			if(handle->dbpath) {
@@ -181,6 +198,24 @@ int handle_set_option(pmhandle_t *handle, unsigned char val, unsigned long data)
 				_alpm_log(PM_LOG_FLOW2, _("PM_OPT_IGNOREPKG flushed"));
 			}
 		break;
+		case PM_OPT_HOLDPKG:
+			if((char *)data && strlen((char *)data) != 0) {
+				handle->holdpkg = _alpm_list_add(handle->holdpkg, strdup((char *)data));
+				_alpm_log(PM_LOG_FLOW2, _("'%s' added to PM_OPT_HOLDPKG"), (char *)data);
+			} else {
+				FREELIST(handle->holdpkg);
+				_alpm_log(PM_LOG_FLOW2, _("PM_OPT_HOLDPKG flushed"));
+			}
+		break;
+		case PM_OPT_NEEDLES:
+			if((char *)data && strlen((char *)data) != 0) {
+				handle->needles = _alpm_list_add(handle->needles, strdup((char *)data));
+				_alpm_log(PM_LOG_FLOW2, _("'%s' added to PM_OPT_NEEDLES"), (char *)data);
+			} else {
+				FREELIST(handle->needles);
+				_alpm_log(PM_LOG_FLOW2, _("PM_OPT_NEEDLES flushed"));
+			}
+		break;
 		case PM_OPT_USESYSLOG:
 			if(data != 0 && data != 1) {
 				RET_ERR(PM_ERR_OPT_USESYSLOG, -1);
@@ -199,10 +234,85 @@ int handle_set_option(pmhandle_t *handle, unsigned char val, unsigned long data)
 		case PM_OPT_LOGCB:
 			pm_logcb = (alpm_cb_log)data;
 		break;
+		case PM_OPT_DLCB:
+			pm_dlcb = (FtpCallback)data;
+		break;
+		case PM_OPT_DLFNM:
+			pm_dlfnm = (char *)data;
+		break;
+		case PM_OPT_DLOFFSET:
+			pm_dloffset = (int *)data;
+		break;
+		case PM_OPT_DLT0:
+			pm_dlt0 = (struct timeval *)data;
+		break;
+		case PM_OPT_DLT:
+			pm_dlt = (struct timeval *)data;
+		break;
+		case PM_OPT_DLRATE:
+			pm_dlrate = (float *)data;
+		break;
+		case PM_OPT_DLXFERED1:
+			pm_dlxfered1 = (int *)data;
+		break;
+		case PM_OPT_DLETA_H:
+			pm_dleta_h = (unsigned char *)data;
+		break;
+		case PM_OPT_DLETA_M:
+			pm_dleta_m = (unsigned char *)data;
+		break;
+		case PM_OPT_DLETA_S:
+			pm_dleta_s = (unsigned char *)data;
+		break;
+		case PM_OPT_UPGRADEDELAY:
+			handle->upgradedelay = data;
+		break;
 		case PM_OPT_LOGMASK:
 			pm_logmask = (unsigned char)data;
 			_alpm_log(PM_LOG_FLOW2, _("PM_OPT_LOGMASK set to '%02x'"), (unsigned char)data);
 		break;
+		case PM_OPT_PROXYHOST:
+			if(handle->proxyhost) {
+				FREE(handle->proxyhost);
+			}
+			p = strstr((char*)data, "://");
+			if(p) {
+				p += 3;
+				if(p == NULL || *p == '\0') {
+					RET_ERR(PM_ERR_SERVER_BAD_LOCATION, -1);
+				}
+				data = (long)p;
+			}
+#if defined(__APPLE__) || defined(__OpenBSD__)
+			handle->proxyhost = strdup((char*)data);
+#else
+			handle->proxyhost = strndup((char*)data, PATH_MAX);
+#endif
+			_alpm_log(PM_LOG_FLOW2, _("PM_OPT_PROXYHOST set to '%s'"), handle->proxyhost);
+		break;
+		case PM_OPT_PROXYPORT:
+			handle->proxyport = (unsigned short)data;
+			_alpm_log(PM_LOG_FLOW2, _("PM_OPT_PROXYPORT set to '%d'"), handle->proxyport);
+		break;
+		case PM_OPT_XFERCOMMAND:
+			if(handle->xfercommand) {
+				FREE(handle->xfercommand);
+			}
+#if defined(__APPLE__) || defined(__OpenBSD__)
+			handle->xfercommand = strdup((char*)data);
+#else
+			handle->xfercommand = strndup((char*)data, PATH_MAX);
+#endif
+			_alpm_log(PM_LOG_FLOW2, _("PM_OPT_XFERCOMMAND set to '%s'"), handle->xfercommand);
+		break;
+		case PM_OPT_NOPASSIVEFTP:
+			handle->nopassiveftp = (unsigned short)data;
+			_alpm_log(PM_LOG_FLOW2, _("PM_OPT_NOPASSIVEFTP set to '%d'"), handle->nopassiveftp);
+		break;
+		case PM_OPT_CHOMP:
+			handle->chomp = (unsigned short)data;
+			_alpm_log(PM_LOG_FLOW2, _("PM_OPT_CHOMP set to '%d'"), handle->chomp);
+		break;
 		default:
 			RET_ERR(PM_ERR_WRONG_ARGS, -1);
 	}
@@ -210,7 +320,7 @@ int handle_set_option(pmhandle_t *handle, unsigned char val, unsigned long data)
 	return(0);
 }
 
-int handle_get_option(pmhandle_t *handle, unsigned char val, long *data)
+int _alpm_handle_get_option(pmhandle_t *handle, unsigned char val, long *data)
 {
 	/* Sanity checks */
 	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
@@ -225,9 +335,27 @@ int handle_get_option(pmhandle_t *handle, unsigned char val, long *data)
 		case PM_OPT_NOUPGRADE: *data = (long)handle->noupgrade; break;
 		case PM_OPT_NOEXTRACT: *data = (long)handle->noextract; break;
 		case PM_OPT_IGNOREPKG: *data = (long)handle->ignorepkg; break;
+		case PM_OPT_HOLDPKG:   *data = (long)handle->holdpkg; break;
+		case PM_OPT_NEEDLES:   *data = (long)handle->needles; break;
 		case PM_OPT_USESYSLOG: *data = handle->usesyslog; break;
 		case PM_OPT_LOGCB:     *data = (long)pm_logcb; break;
+		case PM_OPT_DLCB:     *data = (long)pm_dlcb; break;
+		case PM_OPT_UPGRADEDELAY: *data = (long)handle->upgradedelay; break;
 		case PM_OPT_LOGMASK:   *data = pm_logmask; break;
+		case PM_OPT_DLFNM:     *data = (long)pm_dlfnm; break;
+		case PM_OPT_DLOFFSET:  *data = (long)pm_dloffset; break;
+		case PM_OPT_DLT0:      *data = (long)pm_dlt0; break;
+		case PM_OPT_DLT:       *data = (long)pm_dlt; break;
+		case PM_OPT_DLRATE:    *data = (long)pm_dlrate; break;
+		case PM_OPT_DLXFERED1: *data = (long)pm_dlxfered1; break;
+		case PM_OPT_DLETA_H:   *data = (long)pm_dleta_h; break;
+		case PM_OPT_DLETA_M:   *data = (long)pm_dleta_m; break;
+		case PM_OPT_DLETA_S:   *data = (long)pm_dleta_s; break;
+		case PM_OPT_PROXYHOST: *data = (long)handle->proxyhost; break;
+		case PM_OPT_PROXYPORT: *data = handle->proxyport; break;
+		case PM_OPT_XFERCOMMAND: *data = (long)handle->xfercommand; break;
+		case PM_OPT_NOPASSIVEFTP: *data = handle->nopassiveftp; break;
+		case PM_OPT_CHOMP: *data = handle->chomp; break;
 		default:
 			RET_ERR(PM_ERR_WRONG_ARGS, -1);
 		break;