1 files changed, 723 insertions, 5 deletions

diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index e2a168ee..82f525c4 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -20,13 +20,21 @@
 
 #include "config.h"
 
+#include <errno.h>
+#include <glob.h>
+#include <limits.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h> /* strdup */
+#include <sys/stat.h>
+#include <sys/utsname.h> /* uname */
+#include <unistd.h>
 
 /* pacman */
 #include "conf.h"
 #include "util.h"
+#include "pacman.h"
+#include "callback.h"
 
 /* global config variable */
 config_t *config = NULL;
@@ -38,35 +46,745 @@ config_t *config_new(void)
 			pm_fprintf(stderr, PM_LOG_ERROR,
 					_("malloc failure: could not allocate %zd bytes\n"),
 					sizeof(config_t));
-			return(NULL);
+			return NULL;
 	}
 	/* defaults which may get overridden later */
 	newconfig->op = PM_OP_MAIN;
 	newconfig->logmask = PM_LOG_ERROR | PM_LOG_WARNING;
-	/* CONFFILE is defined at compile-time */
 	newconfig->configfile = strdup(CONFFILE);
+	newconfig->sigverify = PM_PGP_VERIFY_UNKNOWN;
 
-	return(newconfig);
+	return newconfig;
 }
 
 int config_free(config_t *oldconfig)
 {
 	if(oldconfig == NULL) {
-		return(-1);
+		return -1;
 	}
 
 	FREELIST(oldconfig->holdpkg);
 	FREELIST(oldconfig->syncfirst);
+	FREELIST(oldconfig->ignorepkg);
+	FREELIST(oldconfig->ignoregrp);
+	FREELIST(oldconfig->noupgrade);
+	FREELIST(oldconfig->noextract);
 	free(oldconfig->configfile);
 	free(oldconfig->rootdir);
 	free(oldconfig->dbpath);
 	free(oldconfig->logfile);
+	free(oldconfig->gpgdir);
+	FREELIST(oldconfig->cachedirs);
 	free(oldconfig->xfercommand);
 	free(oldconfig->print_format);
+	free(oldconfig->arch);
 	free(oldconfig);
 	oldconfig = NULL;
 
-	return(0);
+	return 0;
+}
+
+/** Helper function for download_with_xfercommand() */
+static char *get_filename(const char *url) {
+	char *filename = strrchr(url, '/');
+	if(filename != NULL) {
+		filename++;
+	}
+	return filename;
+}
+
+/** Helper function for download_with_xfercommand() */
+static char *get_destfile(const char *path, const char *filename) {
+	char *destfile;
+	/* len = localpath len + filename len + null */
+	size_t len = strlen(path) + strlen(filename) + 1;
+	destfile = calloc(len, sizeof(char));
+	snprintf(destfile, len, "%s%s", path, filename);
+
+	return destfile;
+}
+
+/** Helper function for download_with_xfercommand() */
+static char *get_tempfile(const char *path, const char *filename) {
+	char *tempfile;
+	/* len = localpath len + filename len + '.part' len + null */
+	size_t len = strlen(path) + strlen(filename) + 6;
+	tempfile = calloc(len, sizeof(char));
+	snprintf(tempfile, len, "%s%s.part", path, filename);
+
+	return tempfile;
+}
+
+/** External fetch callback */
+static int download_with_xfercommand(const char *url, const char *localpath,
+		int force) {
+	int ret = 0;
+	int retval;
+	int usepart = 0;
+	struct stat st;
+	char *parsedcmd,*tempcmd;
+	char cwd[PATH_MAX];
+	int restore_cwd = 0;
+	char *destfile, *tempfile, *filename;
+
+	if(!config->xfercommand) {
+		return -1;
+	}
+
+	filename = get_filename(url);
+	if(!filename) {
+		return -1;
+	}
+	destfile = get_destfile(localpath, filename);
+	tempfile = get_tempfile(localpath, filename);
+
+	if(force && stat(tempfile, &st) == 0) {
+		unlink(tempfile);
+	}
+	if(force && stat(destfile, &st) == 0) {
+		unlink(destfile);
+	}
+
+	tempcmd = strdup(config->xfercommand);
+	/* replace all occurrences of %o with fn.part */
+	if(strstr(tempcmd, "%o")) {
+		usepart = 1;
+		parsedcmd = strreplace(tempcmd, "%o", tempfile);
+		free(tempcmd);
+		tempcmd = parsedcmd;
+	}
+	/* replace all occurrences of %u with the download URL */
+	parsedcmd = strreplace(tempcmd, "%u", url);
+	free(tempcmd);
+
+	/* save the cwd so we can restore it later */
+	if(getcwd(cwd, PATH_MAX) == NULL) {
+		pm_printf(PM_LOG_ERROR, _("could not get current working directory\n"));
+	} else {
+		restore_cwd = 1;
+	}
+
+	/* cwd to the download directory */
+	if(chdir(localpath)) {
+		pm_printf(PM_LOG_WARNING, _("could not chdir to download directory %s\n"), localpath);
+		ret = -1;
+		goto cleanup;
+	}
+	/* execute the parsed command via /bin/sh -c */
+	pm_printf(PM_LOG_DEBUG, "running command: %s\n", parsedcmd);
+	retval = system(parsedcmd);
+
+	if(retval == -1) {
+		pm_printf(PM_LOG_WARNING, _("running XferCommand: fork failed!\n"));
+		ret = -1;
+	} else if(retval != 0) {
+		/* download failed */
+		pm_printf(PM_LOG_DEBUG, "XferCommand command returned non-zero status "
+				"code (%d)\n", retval);
+		ret = -1;
+	} else {
+		/* download was successful */
+		if(usepart) {
+			rename(tempfile, destfile);
+		}
+		ret = 0;
+	}
+
+cleanup:
+	/* restore the old cwd if we have it */
+	if(restore_cwd && chdir(cwd) != 0) {
+		pm_printf(PM_LOG_ERROR, _("could not change directory to %s (%s)\n"),
+				cwd, strerror(errno));
+	}
+
+	if(ret == -1) {
+		/* hack to let an user the time to cancel a download */
+		sleep(2);
+	}
+	free(destfile);
+	free(tempfile);
+	free(parsedcmd);
+
+	return ret;
+}
+
+
+int config_set_arch(const char *arch)
+{
+	if(strcmp(arch, "auto") == 0) {
+		struct utsname un;
+		uname(&un);
+		config->arch = strdup(un.machine);
+	} else {
+		config->arch = strdup(arch);
+	}
+	pm_printf(PM_LOG_DEBUG, "config: arch: %s\n", config->arch);
+	return 0;
+}
+
+static pgp_verify_t option_verifysig(const char *value)
+{
+	pgp_verify_t level;
+	if(strcmp(value, "Always") == 0) {
+		level = PM_PGP_VERIFY_ALWAYS;
+	} else if(strcmp(value, "Optional") == 0) {
+		level = PM_PGP_VERIFY_OPTIONAL;
+	} else if(strcmp(value, "Never") == 0) {
+		level = PM_PGP_VERIFY_NEVER;
+	} else {
+		level = PM_PGP_VERIFY_UNKNOWN;
+	}
+	pm_printf(PM_LOG_DEBUG, "config: VerifySig = %s (%d)\n", value, level);
+	return level;
+}
+
+static int process_cleanmethods(alpm_list_t *values) {
+	alpm_list_t *i;
+	for(i = values; i; i = alpm_list_next(i)) {
+		const char *value = i->data;
+		if(strcmp(value, "KeepInstalled") == 0) {
+			config->cleanmethod |= PM_CLEAN_KEEPINST;
+		} else if(strcmp(value, "KeepCurrent") == 0) {
+			config->cleanmethod |= PM_CLEAN_KEEPCUR;
+		} else {
+			pm_printf(PM_LOG_ERROR, _("invalid value for 'CleanMethod' : '%s'\n"),
+					value);
+			return 1;
+		}
+	}
+	return 0;
+}
+
+/** Add repeating options such as NoExtract, NoUpgrade, etc to libalpm
+ * settings. Refactored out of the parseconfig code since all of them did
+ * the exact same thing and duplicated code.
+ * @param ptr a pointer to the start of the multiple options
+ * @param option the string (friendly) name of the option, used for messages
+ * @param list the list to add the option to
+ */
+static void setrepeatingoption(char *ptr, const char *option,
+		alpm_list_t **list)
+{
+	char *q;
+
+	while((q = strchr(ptr, ' '))) {
+		*q = '\0';
+		*list = alpm_list_add(*list, strdup(ptr));
+		pm_printf(PM_LOG_DEBUG, "config: %s: %s\n", option, ptr);
+		ptr = q;
+		ptr++;
+	}
+	*list = alpm_list_add(*list, strdup(ptr));
+	pm_printf(PM_LOG_DEBUG, "config: %s: %s\n", option, ptr);
+}
+
+static int _parse_options(const char *key, char *value,
+		const char *file, int linenum)
+{
+	if(value == NULL) {
+		/* options without settings */
+		if(strcmp(key, "UseSyslog") == 0) {
+			config->usesyslog = 1;
+			pm_printf(PM_LOG_DEBUG, "config: usesyslog\n");
+		} else if(strcmp(key, "ILoveCandy") == 0) {
+			config->chomp = 1;
+			pm_printf(PM_LOG_DEBUG, "config: chomp\n");
+		} else if(strcmp(key, "VerbosePkgLists") == 0) {
+			config->verbosepkglists = 1;
+			pm_printf(PM_LOG_DEBUG, "config: verbosepkglists\n");
+		} else if(strcmp(key, "UseDelta") == 0) {
+			config->usedelta = 1;
+			pm_printf(PM_LOG_DEBUG, "config: usedelta\n");
+		} else if(strcmp(key, "TotalDownload") == 0) {
+			config->totaldownload = 1;
+			pm_printf(PM_LOG_DEBUG, "config: totaldownload\n");
+		} else if(strcmp(key, "CheckSpace") == 0) {
+			config->checkspace = 1;
+		} else {
+			pm_printf(PM_LOG_WARNING,
+					_("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"),
+					file, linenum, key, "options");
+		}
+	} else {
+		/* options with settings */
+		if(strcmp(key, "NoUpgrade") == 0) {
+			setrepeatingoption(value, "NoUpgrade", &(config->noupgrade));
+		} else if(strcmp(key, "NoExtract") == 0) {
+			setrepeatingoption(value, "NoExtract", &(config->noextract));
+		} else if(strcmp(key, "IgnorePkg") == 0) {
+			setrepeatingoption(value, "IgnorePkg", &(config->ignorepkg));
+		} else if(strcmp(key, "IgnoreGroup") == 0) {
+			setrepeatingoption(value, "IgnoreGroup", &(config->ignoregrp));
+		} else if(strcmp(key, "HoldPkg") == 0) {
+			setrepeatingoption(value, "HoldPkg", &(config->holdpkg));
+		} else if(strcmp(key, "SyncFirst") == 0) {
+			setrepeatingoption(value, "SyncFirst", &(config->syncfirst));
+		} else if(strcmp(key, "CacheDir") == 0) {
+			setrepeatingoption(value, "CacheDir", &(config->cachedirs));
+		} else if(strcmp(key, "Architecture") == 0) {
+			if(!config->arch) {
+				config_set_arch(value);
+			}
+		} else if(strcmp(key, "DBPath") == 0) {
+			/* don't overwrite a path specified on the command line */
+			if(!config->dbpath) {
+				config->dbpath = strdup(value);
+				pm_printf(PM_LOG_DEBUG, "config: dbpath: %s\n", value);
+			}
+		} else if(strcmp(key, "RootDir") == 0) {
+			/* don't overwrite a path specified on the command line */
+			if(!config->rootdir) {
+				config->rootdir = strdup(value);
+				pm_printf(PM_LOG_DEBUG, "config: rootdir: %s\n", value);
+			}
+		} else if(strcmp(key, "GPGDir") == 0) {
+			if(!config->gpgdir) {
+				config->gpgdir = strdup(value);
+				pm_printf(PM_LOG_DEBUG, "config: gpgdir: %s\n", value);
+			}
+		} else if(strcmp(key, "LogFile") == 0) {
+			if(!config->logfile) {
+				config->logfile = strdup(value);
+				pm_printf(PM_LOG_DEBUG, "config: logfile: %s\n", value);
+			}
+		} else if(strcmp(key, "XferCommand") == 0) {
+			config->xfercommand = strdup(value);
+			pm_printf(PM_LOG_DEBUG, "config: xfercommand: %s\n", value);
+		} else if(strcmp(key, "CleanMethod") == 0) {
+			alpm_list_t *methods = NULL;
+			setrepeatingoption(value, "CleanMethod", &methods);
+			if(process_cleanmethods(methods)) {
+				FREELIST(methods);
+				return 1;
+			}
+			FREELIST(methods);
+		} else if(strcmp(key, "VerifySig") == 0) {
+			pgp_verify_t level = option_verifysig(value);
+			if(level != PM_PGP_VERIFY_UNKNOWN) {
+				config->sigverify = level;
+			} else {
+				pm_printf(PM_LOG_ERROR,
+						_("config file %s, line %d: directive '%s' has invalid value '%s'\n"),
+						file, linenum, key, value);
+				return 1;
+			}
+		} else {
+			pm_printf(PM_LOG_WARNING,
+					_("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"),
+					file, linenum, key, "options");
+		}
+
+	}
+	return 0;
+}
+
+static int _add_mirror(pmdb_t *db, char *value)
+{
+	const char *dbname = alpm_db_get_name(db);
+	/* let's attempt a replacement for the current repo */
+	char *temp = strreplace(value, "$repo", dbname);
+	/* let's attempt a replacement for the arch */
+	const char *arch = config->arch;
+	char *server;
+	if(arch) {
+		server = strreplace(temp, "$arch", arch);
+		free(temp);
+	} else {
+		if(strstr(temp, "$arch")) {
+			free(temp);
+			pm_printf(PM_LOG_ERROR, _("The mirror '%s' contains the $arch"
+						" variable, but no Architecture is defined.\n"), value);
+			return 1;
+		}
+		server = temp;
+	}
+
+	if(alpm_db_add_server(db, server) != 0) {
+		/* pm_errno is set by alpm_db_setserver */
+		pm_printf(PM_LOG_ERROR, _("could not add server URL to database '%s': %s (%s)\n"),
+				dbname, server, alpm_strerror(alpm_errno(config->handle)));
+		free(server);
+		return 1;
+	}
+
+	free(server);
+	return 0;
+}
+
+/** Sets up libalpm global stuff in one go. Called after the command line
+ * and inital config file parsing. Once this is complete, we can see if any
+ * paths were defined. If a rootdir was defined and nothing else, we want all
+ * of our paths to live under the rootdir that was specified. Safe to call
+ * multiple times (will only do anything the first time).
+ */
+static int setup_libalpm(void)
+{
+	int ret = 0;
+	enum _pmerrno_t err;
+	pmhandle_t *handle;
+
+	pm_printf(PM_LOG_DEBUG, "setup_libalpm called\n");
+
+	/* Configure root path first. If it is set and dbpath/logfile were not
+	 * set, then set those as well to reside under the root. */
+	if(config->rootdir) {
+		char path[PATH_MAX];
+		if(!config->dbpath) {
+			snprintf(path, PATH_MAX, "%s/%s", config->rootdir, DBPATH + 1);
+			config->dbpath = strdup(path);
+		}
+		if(!config->logfile) {
+			snprintf(path, PATH_MAX, "%s/%s", config->rootdir, LOGFILE + 1);
+			config->logfile = strdup(path);
+		}
+	} else {
+		config->rootdir = strdup(ROOTDIR);
+		if(!config->dbpath) {
+			config->dbpath = strdup(DBPATH);
+		}
+	}
+
+	/* initialize library */
+	handle = alpm_initialize(config->rootdir, config->dbpath, &err);
+	if(!handle) {
+		pm_printf(PM_LOG_ERROR, _("failed to initialize alpm library (%s)\n"),
+		        alpm_strerror(err));
+		return -1;
+	}
+	config->handle = handle;
+
+	alpm_option_set_logcb(handle, cb_log);
+	alpm_option_set_dlcb(handle, cb_dl_progress);
+
+	config->logfile = config->logfile ? config->logfile : strdup(LOGFILE);
+	ret = alpm_option_set_logfile(handle, config->logfile);
+	if(ret != 0) {
+		pm_printf(PM_LOG_ERROR, _("problem setting logfile '%s' (%s)\n"),
+				config->logfile, alpm_strerror(alpm_errno(config->handle)));
+		return ret;
+	}
+
+	/* Set GnuPG's home directory.  This is not relative to rootdir, even if
+	 * rootdir is defined. Reasoning: gpgdir contains configuration data. */
+	config->gpgdir = config->gpgdir ? config->gpgdir : strdup(GPGDIR);
+	ret = alpm_option_set_signaturedir(handle, config->gpgdir);
+	if(ret != 0) {
+		pm_printf(PM_LOG_ERROR, _("problem setting gpgdir '%s' (%s)\n"),
+				config->gpgdir, alpm_strerror(alpm_errno(config->handle)));
+		return ret;
+	}
+
+	/* add a default cachedir if one wasn't specified */
+	if(config->cachedirs == NULL) {
+		alpm_option_add_cachedir(handle, CACHEDIR);
+	} else {
+		alpm_option_set_cachedirs(handle, config->cachedirs);
+	}
+
+	if(config->sigverify != PM_PGP_VERIFY_UNKNOWN) {
+		alpm_option_set_default_sigverify(handle, config->sigverify);
+	}
+
+	if(config->xfercommand) {
+		alpm_option_set_fetchcb(handle, download_with_xfercommand);
+	}
+
+	if(config->totaldownload) {
+		alpm_option_set_totaldlcb(handle, cb_dl_total);
+	}
+
+	alpm_option_set_arch(handle, config->arch);
+	alpm_option_set_checkspace(handle, config->checkspace);
+	alpm_option_set_usesyslog(handle, config->usesyslog);
+	alpm_option_set_usedelta(handle, config->usedelta);
+
+	alpm_option_set_ignorepkgs(handle, config->ignorepkg);
+	alpm_option_set_ignoregrps(handle, config->ignoregrp);
+	alpm_option_set_noupgrades(handle, config->noupgrade);
+	alpm_option_set_noextracts(handle, config->noextract);
+
+	return 0;
+}
+
+/**
+ * Allows parsing in advance of an entire config section before we start
+ * calling library methods.
+ */
+struct section_t {
+	/* useful for all sections */
+	char *name;
+	int is_options;
+	/* db section option gathering */
+	pgp_verify_t sigverify;
+	alpm_list_t *servers;
+};
+
+/**
+ * Wrap up a section once we have reached the end of it. This should be called
+ * when a subsequent section is encountered, or when we have reached the end of
+ * the root config file. Once called, all existing saved config pieces on the
+ * section struct are freed.
+ * @param section the current parsed and saved section data
+ * @param parse_options whether we are parsing options or repo data
+ * @return 0 on success, 1 on failure
+ */
+static int finish_section(struct section_t *section, int parse_options)
+{
+	int ret = 0;
+	alpm_list_t *i;
+	pmdb_t *db;
+
+	pm_printf(PM_LOG_DEBUG, "config: finish section '%s'\n", section->name);
+
+	/* parsing options (or nothing)- nothing to do except free the pieces */
+	if(!section->name || parse_options || section->is_options) {
+		goto cleanup;
+	}
+
+	/* if we are not looking at options sections only, register a db */
+	db = alpm_db_register_sync(config->handle, section->name);
+	if(db == NULL) {
+		pm_printf(PM_LOG_ERROR, _("could not register '%s' database (%s)\n"),
+				section->name, alpm_strerror(alpm_errno(config->handle)));
+		ret = 1;
+		goto cleanup;
+	}
+
+	if(section->sigverify) {
+		if(alpm_db_set_pgp_verify(db, section->sigverify)) {
+			pm_printf(PM_LOG_ERROR,
+					_("could not set verify option for database '%s' (%s)\n"),
+					section->name, alpm_strerror(alpm_errno(config->handle)));
+			ret = 1;
+			goto cleanup;
+		}
+	}
+
+	for(i = section->servers; i; i = alpm_list_next(i)) {
+		char *value = alpm_list_getdata(i);
+		if(_add_mirror(db, value) != 0) {
+			pm_printf(PM_LOG_ERROR,
+					_("could not add mirror '%s' to database '%s' (%s)\n"),
+					value, section->name, alpm_strerror(alpm_errno(config->handle)));
+			ret = 1;
+			goto cleanup;
+		}
+		free(value);
+	}
+
+cleanup:
+	alpm_list_free(section->servers);
+	section->servers = NULL;
+	section->sigverify = 0;
+	free(section->name);
+	section->name = NULL;
+	return ret;
+}
+
+/** The "real" parseconfig. Each "Include" directive will recall this method so
+ * recursion and stack depth are limited to 10 levels. The publicly visible
+ * parseconfig calls this with a NULL section argument so we can recall from
+ * within ourself on an include.
+ * @param file path to the config file
+ * @param section the current active section
+ * @param parse_options whether to parse and call methods for the options
+ * section; if 0, parse and call methods for the repos sections
+ * @param depth the current recursion depth
+ * @return 0 on success, 1 on failure
+ */
+static int _parseconfig(const char *file, struct section_t *section,
+		int parse_options, int depth)
+{
+	FILE *fp = NULL;
+	char line[PATH_MAX];
+	int linenum = 0;
+	int ret = 0;
+	const int max_depth = 10;
+
+	if(depth >= max_depth) {
+		pm_printf(PM_LOG_ERROR,
+				_("config parsing exceeded max recursion depth of %d.\n"), max_depth);
+		ret = 1;
+		goto cleanup;
+	}
+
+	pm_printf(PM_LOG_DEBUG, "config: attempting to read file %s\n", file);
+	fp = fopen(file, "r");
+	if(fp == NULL) {
+		pm_printf(PM_LOG_ERROR, _("config file %s could not be read.\n"), file);
+		ret = 1;
+		goto cleanup;
+	}
+
+	while(fgets(line, PATH_MAX, fp)) {
+		char *key, *value, *ptr;
+		size_t line_len;
+
+		linenum++;
+		strtrim(line);
+		line_len = strlen(line);
+
+		/* ignore whole line and end of line comments */
+		if(line_len == 0 || line[0] == '#') {
+			continue;
+		}
+		if((ptr = strchr(line, '#'))) {
+			*ptr = '\0';
+		}
+
+		if(line[0] == '[' && line[line_len - 1] == ']') {
+			char *name;
+			/* only possibility here is a line == '[]' */
+			if(line_len <= 2) {
+				pm_printf(PM_LOG_ERROR, _("config file %s, line %d: bad section name.\n"),
+						file, linenum);
+				ret = 1;
+				goto cleanup;
+			}
+			/* new config section, skip the '[' */
+			name = strdup(line + 1);
+			name[line_len - 2] = '\0';
+			/* we're at a new section; perform any post-actions for the prior */
+			if(finish_section(section, parse_options)) {
+				ret = 1;
+				goto cleanup;
+			}
+			pm_printf(PM_LOG_DEBUG, "config: new section '%s'\n", name);
+			section->name = name;
+			section->is_options = (strcmp(name, "options") == 0);
+			continue;
+		}
+
+		/* directive */
+		/* strsep modifies the 'line' string: 'key \0 value' */
+		key = line;
+		value = line;
+		strsep(&value, "=");
+		strtrim(key);
+		strtrim(value);
+
+		if(key == NULL) {
+			pm_printf(PM_LOG_ERROR, _("config file %s, line %d: syntax error in config file- missing key.\n"),
+					file, linenum);
+			ret = 1;
+			goto cleanup;
+		}
+		/* For each directive, compare to the camelcase string. */
+		if(section->name == NULL) {
+			pm_printf(PM_LOG_ERROR, _("config file %s, line %d: All directives must belong to a section.\n"),
+					file, linenum);
+			ret = 1;
+			goto cleanup;
+		}
+		/* Include is allowed in both options and repo sections */
+		if(strcmp(key, "Include") == 0) {
+			glob_t globbuf;
+			int globret;
+			size_t gindex;
+
+			if(value == NULL) {
+				pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' needs a value\n"),
+						file, linenum, key);
+				ret = 1;
+				goto cleanup;
+			}
+			/* Ignore include failures... assume non-critical */
+			globret = glob(value, GLOB_NOCHECK, NULL, &globbuf);
+			switch(globret) {
+				case GLOB_NOSPACE:
+					pm_printf(PM_LOG_DEBUG,
+							"config file %s, line %d: include globbing out of space\n",
+							file, linenum);
+				break;
+				case GLOB_ABORTED:
+					pm_printf(PM_LOG_DEBUG,
+							"config file %s, line %d: include globbing read error for %s\n",
+							file, linenum, value);
+				break;
+				case GLOB_NOMATCH:
+					pm_printf(PM_LOG_DEBUG,
+							"config file %s, line %d: no include found for %s\n",
+							file, linenum, value);
+				break;
+				default:
+					for(gindex = 0; gindex < globbuf.gl_pathc; gindex++) {
+						pm_printf(PM_LOG_DEBUG, "config file %s, line %d: including %s\n",
+								file, linenum, globbuf.gl_pathv[gindex]);
+						_parseconfig(globbuf.gl_pathv[gindex], section, parse_options, depth + 1);
+					}
+				break;
+			}
+			globfree(&globbuf);
+			continue;
+		}
+		if(parse_options && section->is_options) {
+			/* we are either in options ... */
+			if((ret = _parse_options(key, value, file, linenum)) != 0) {
+				goto cleanup;
+			}
+		} else if (!parse_options && !section->is_options) {
+			/* ... or in a repo section */
+			if(strcmp(key, "Server") == 0) {
+				if(value == NULL) {
+					pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' needs a value\n"),
+							file, linenum, key);
+					ret = 1;
+					goto cleanup;
+				}
+				section->servers = alpm_list_add(section->servers, strdup(value));
+			} else if(strcmp(key, "VerifySig") == 0) {
+				pgp_verify_t level = option_verifysig(value);
+				if(level != PM_PGP_VERIFY_UNKNOWN) {
+					section->sigverify = level;
+				} else {
+					pm_printf(PM_LOG_ERROR,
+							_("config file %s, line %d: directive '%s' has invalid value '%s'\n"),
+							file, linenum, key, value);
+					ret = 1;
+					goto cleanup;
+				}
+			} else {
+				pm_printf(PM_LOG_WARNING,
+						_("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"),
+						file, linenum, key, section->name);
+			}
+		}
+	}
+
+	if(depth == 0) {
+		ret = finish_section(section, parse_options);
+	}
+
+cleanup:
+	fclose(fp);
+	pm_printf(PM_LOG_DEBUG, "config: finished parsing %s\n", file);
+	return ret;
+}
+
+/** Parse a configuration file.
+ * @param file path to the config file
+ * @return 0 on success, non-zero on error
+ */
+int parseconfig(const char *file)
+{
+	int ret;
+	struct section_t section;
+	memset(&section, 0, sizeof(struct section_t));
+	/* the config parse is a two-pass affair. We first parse the entire thing for
+	 * the [options] section so we can get all default and path options set.
+	 * Next, we go back and parse everything but [options]. */
+
+	/* call the real parseconfig function with a null section & db argument */
+	pm_printf(PM_LOG_DEBUG, "parseconfig: options pass\n");
+	if((ret = _parseconfig(file, &section, 1, 0))) {
+		return ret;
+	}
+	if((ret = setup_libalpm())) {
+		return ret;
+	}
+	/* second pass, repo section parsing */
+	pm_printf(PM_LOG_DEBUG, "parseconfig: repo pass\n");
+	return _parseconfig(file, &section, 0, 0);
 }
 
 /* vim: set ts=2 sw=2 noet: */