X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fopkg_conf.c;h=bf7a56313ad4ada36611a4207fe1a50e8f2bd48f;hp=69b693568f070ee1a135bde8743cc24120ee8b3d;hb=e62fc971a19b43df377d8beee9e691ab179ca075;hpb=2fdb3fc0b67757afd6fe7a244b6e14d2a546af0e

diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index 69b6935..bf7a563 100644
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -1,7 +1,8 @@
 /* opkg_conf.c - the opkg package management system
 
-   Carl D. Worth
+   Copyright (C) 2009 Ubiq Technologies <graham.gower@gmail.com>
 
+   Carl D. Worth
    Copyright (C) 2001 University of Southern California
 
    This program is free software; you can redistribute it and/or
@@ -15,24 +16,27 @@
    General Public License for more details.
 */
 
-#include "includes.h"
-#include "opkg_conf.h"
+#include "config.h"
 
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <glob.h>
+#include <unistd.h>
+
+#include "opkg_conf.h"
+#include "pkg_vec.h"
+#include "pkg.h"
 #include "xregex.h"
 #include "sprintf_alloc.h"
-#include "args.h"
 #include "opkg_message.h"
 #include "file_util.h"
 #include "opkg_defines.h"
 #include "libbb/libbb.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <glob.h>
-
 static int lock_fd;
+static char *lock_file = NULL;
 
 static opkg_conf_t _conf;
 opkg_conf_t *conf = &_conf;
@@ -43,20 +47,24 @@ opkg_conf_t *conf = &_conf;
 opkg_option_t options[] = {
 	  { "cache", OPKG_OPT_TYPE_STRING, &_conf.cache},
 	  { "force_defaults", OPKG_OPT_TYPE_BOOL, &_conf.force_defaults },
-          { "force_maintainer", OPKG_OPT_TYPE_BOOL, &_conf.force_maintainer }, 
+          { "force_maintainer", OPKG_OPT_TYPE_BOOL, &_conf.force_maintainer },
 	  { "force_depends", OPKG_OPT_TYPE_BOOL, &_conf.force_depends },
 	  { "force_overwrite", OPKG_OPT_TYPE_BOOL, &_conf.force_overwrite },
 	  { "force_downgrade", OPKG_OPT_TYPE_BOOL, &_conf.force_downgrade },
 	  { "force_reinstall", OPKG_OPT_TYPE_BOOL, &_conf.force_reinstall },
 	  { "force_space", OPKG_OPT_TYPE_BOOL, &_conf.force_space },
-          { "check_signature", OPKG_OPT_TYPE_BOOL, &_conf.check_signature }, 
+	  { "force_postinstall", OPKG_OPT_TYPE_BOOL, &_conf.force_postinstall },
+          { "check_signature", OPKG_OPT_TYPE_BOOL, &_conf.check_signature },
 	  { "ftp_proxy", OPKG_OPT_TYPE_STRING, &_conf.ftp_proxy },
 	  { "http_proxy", OPKG_OPT_TYPE_STRING, &_conf.http_proxy },
 	  { "no_proxy", OPKG_OPT_TYPE_STRING, &_conf.no_proxy },
 	  { "test", OPKG_OPT_TYPE_BOOL, &_conf.noaction },
 	  { "noaction", OPKG_OPT_TYPE_BOOL, &_conf.noaction },
+	  { "download_only", OPKG_OPT_TYPE_BOOL, &_conf.download_only },
 	  { "nodeps", OPKG_OPT_TYPE_BOOL, &_conf.nodeps },
+	  { "nocase", OPKG_OPT_TYPE_BOOL, &_conf.nocase },
 	  { "offline_root", OPKG_OPT_TYPE_STRING, &_conf.offline_root },
+	  { "overlay_root", OPKG_OPT_TYPE_STRING, &_conf.overlay_root },
 	  { "proxy_passwd", OPKG_OPT_TYPE_STRING, &_conf.proxy_passwd },
 	  { "proxy_user", OPKG_OPT_TYPE_STRING, &_conf.proxy_user },
 	  { "query-all", OPKG_OPT_TYPE_BOOL, &_conf.query_all },
@@ -67,7 +75,7 @@ opkg_option_t options[] = {
 	  { "signature_ca_path", OPKG_OPT_TYPE_STRING, &_conf.signature_ca_path },
 #endif
 #if defined(HAVE_PATHFINDER)
-          { "check_x509_path", OPKG_OPT_TYPE_BOOL, &_conf.check_x509_path }, 
+          { "check_x509_path", OPKG_OPT_TYPE_BOOL, &_conf.check_x509_path },
 #endif
 #if defined(HAVE_SSLCURL) && defined(HAVE_CURL)
           { "ssl_engine", OPKG_OPT_TYPE_STRING, &_conf.ssl_engine },
@@ -84,63 +92,15 @@ opkg_option_t options[] = {
 };
 
 static int
-opkg_conf_set_default_dest(const char *default_dest_name)
-{
-     pkg_dest_list_elt_t *iter;
-     pkg_dest_t *dest;
-
-     for (iter = void_list_first(&conf->pkg_dest_list); iter; iter = void_list_next(&conf->pkg_dest_list, iter)) {
-	  dest = (pkg_dest_t *)iter->data;
-	  if (strcmp(dest->name, default_dest_name) == 0) {
-	       conf->default_dest = dest;
-	       conf->restrict_to_default_dest = 1;
-	       return 0;
-	  }
-     }
-
-     opkg_msg(ERROR, "Unknown dest name: `%s'.\n", default_dest_name);
-
-     return 1;
-}
-
-static int
-set_and_load_pkg_src_list(pkg_src_list_t *pkg_src_list)
-{
-     pkg_src_list_elt_t *iter;
-     pkg_src_t *src;
-     char *list_file;
-
-     for (iter = void_list_first(pkg_src_list); iter; iter = void_list_next(pkg_src_list, iter)) {
-          src = (pkg_src_t *)iter->data;
-	  if (src == NULL) {
-	       continue;
-	  }
-
-	  sprintf_alloc(&list_file, "%s/%s", 
-			  conf->restrict_to_default_dest ? conf->default_dest->lists_dir : conf->lists_dir, 
-			  src->name);
-
-	  if (file_exists(list_file)) {
-	       if (pkg_hash_add_from_file(list_file, src, NULL, 0)) {
-		    free(list_file);
-		    return -1;
-	       }
-	  }
-	  free(list_file);
-     }
-
-     return 0;
-}
-
-static int
-set_and_load_pkg_dest_list(nv_pair_list_t *nv_pair_list)
+resolve_pkg_dest_list(void)
 {
      nv_pair_list_elt_t *iter;
      nv_pair_t *nv_pair;
      pkg_dest_t *dest;
      char *root_dir;
 
-     for (iter = nv_pair_list_first(nv_pair_list); iter; iter = nv_pair_list_next(nv_pair_list, iter)) {
+     for (iter = nv_pair_list_first(&conf->tmp_dest_list); iter;
+		     iter = nv_pair_list_next(&conf->tmp_dest_list, iter)) {
 	  nv_pair = (nv_pair_t *)iter->data;
 
 	  if (conf->offline_root) {
@@ -148,21 +108,24 @@ set_and_load_pkg_dest_list(nv_pair_list_t *nv_pair_list)
 	  } else {
 	       root_dir = xstrdup(nv_pair->value);
 	  }
+
 	  dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, conf->lists_dir);
 	  free(root_dir);
-	  if (dest == NULL) {
-	       continue;
-	  }
-	  if (conf->default_dest == NULL) {
+
+	  if (conf->default_dest == NULL)
 	       conf->default_dest = dest;
-	  }
-	  if (file_exists(dest->status_file_name)) {
-	       if (pkg_hash_add_from_file(dest->status_file_name,
-				      NULL, dest, 1))
-		       return -1;
+
+	  if (conf->dest_str && !strcmp(dest->name, conf->dest_str)) {
+	       conf->default_dest = dest;
+	       conf->restrict_to_default_dest = 1;
 	  }
      }
 
+     if (conf->dest_str && !conf->restrict_to_default_dest) {
+	  opkg_msg(ERROR, "Unknown dest name: `%s'.\n", conf->dest_str);
+	  return -1;
+     }
+
      return 0;
 }
 
@@ -170,6 +133,7 @@ static int
 opkg_conf_set_option(const char *name, const char *value)
 {
      int i = 0;
+
      while (options[i].name) {
 	  if (strcmp(options[i].name, name) == 0) {
 	       switch (options[i].type) {
@@ -195,7 +159,7 @@ opkg_conf_set_option(const char *name, const char *value)
 			 opkg_msg(ERROR, "Option %s needs an argument\n",
 				name);
 			 return -1;
-		    }		    
+		    }
 	       case OPKG_OPT_TYPE_STRING:
 		    if (value) {
 			    if (*(char **)options[i].value) {
@@ -215,7 +179,7 @@ opkg_conf_set_option(const char *name, const char *value)
 	  }
 	  i++;
      }
-    
+
      opkg_msg(ERROR, "Unrecognized option: %s=%s\n", name, value);
      return -1;
 }
@@ -223,47 +187,51 @@ opkg_conf_set_option(const char *name, const char *value)
 static int
 opkg_conf_parse_file(const char *filename,
 				pkg_src_list_t *pkg_src_list,
-				nv_pair_list_t *tmp_dest_nv_pair_list)
+				pkg_src_list_t *dist_src_list)
 {
-     int err;
+     int line_num = 0;
+     int err = 0;
      FILE *file;
      regex_t valid_line_re, comment_re;
-#define regmatch_size 12
+#define regmatch_size 14
      regmatch_t regmatch[regmatch_size];
 
      file = fopen(filename, "r");
      if (file == NULL) {
 	  opkg_perror(ERROR, "Failed to open %s", filename);
-	  return -1;
+	  err = -1;
+	  goto err0;
      }
 
      opkg_msg(INFO, "Loading conf file %s.\n", filename);
 
-     err = xregcomp(&comment_re, 
+     err = xregcomp(&comment_re,
 		    "^[[:space:]]*(#.*|[[:space:]]*)$",
 		    REG_EXTENDED);
-     if (err) {
-	  return -1;
-     }
-     err = xregcomp(&valid_line_re, "^[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))([[:space:]]+([^[:space:]]+))?[[:space:]]*$", REG_EXTENDED);
-     if (err) {
-	  return -1;
-     }
+     if (err)
+          goto err1;
+
+     err = xregcomp(&valid_line_re,
+		     "^[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))"
+		     "[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))"
+		     "[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))"
+		     "([[:space:]]+([^[:space:]]+))?([[:space:]]+(.*))?[[:space:]]*$",
+		     REG_EXTENDED);
+     if (err)
+	  goto err2;
 
      while(1) {
-	  int line_num = 0;
 	  char *line;
 	  char *type, *name, *value, *extra;
 
-	  line = file_read_line_alloc(file);
 	  line_num++;
-	  if (line == NULL) {
+
+	  line = file_read_line_alloc(file);
+	  if (line == NULL)
 	       break;
-	  }
 
-	  if (regexec(&comment_re, line, 0, 0, 0) == 0) {
+	  if (regexec(&comment_re, line, 0, 0, 0) == 0)
 	       goto NEXT_LINE;
-	  }
 
 	  if (regexec(&valid_line_re, line, regmatch_size, regmatch, 0) == REG_NOMATCH) {
 	       opkg_msg(ERROR, "%s:%d: Ignoring invalid line: `%s'\n",
@@ -279,6 +247,7 @@ opkg_conf_parse_file(const char *filename,
 	       type = xstrndup(line + regmatch[3].rm_so,
 			      regmatch[3].rm_eo - regmatch[3].rm_so);
 	  }
+
 	  if (regmatch[5].rm_so > 0) {
 	       name = xstrndup(line + regmatch[5].rm_so,
 			      regmatch[5].rm_eo - regmatch[5].rm_so);
@@ -286,6 +255,7 @@ opkg_conf_parse_file(const char *filename,
 	       name = xstrndup(line + regmatch[6].rm_so,
 			      regmatch[6].rm_eo - regmatch[6].rm_so);
 	  }
+
 	  if (regmatch[8].rm_so > 0) {
 	       value = xstrndup(line + regmatch[8].rm_so,
 			       regmatch[8].rm_eo - regmatch[8].rm_so);
@@ -293,13 +263,23 @@ opkg_conf_parse_file(const char *filename,
 	       value = xstrndup(line + regmatch[9].rm_so,
 			       regmatch[9].rm_eo - regmatch[9].rm_so);
 	  }
+
 	  extra = NULL;
 	  if (regmatch[11].rm_so > 0) {
+	     if (regmatch[13].rm_so > 0 && regmatch[13].rm_so!=regmatch[13].rm_eo )
+	       extra = xstrndup (line + regmatch[11].rm_so,
+				regmatch[13].rm_eo - regmatch[11].rm_so);
+	     else
 	       extra = xstrndup (line + regmatch[11].rm_so,
 				regmatch[11].rm_eo - regmatch[11].rm_so);
 	  }
 
-	  /* We use the tmp_dest_nv_pair_list below instead of
+	  if (regmatch[13].rm_so!=regmatch[13].rm_eo && strncmp(type, "dist", 4)!=0) {
+	       opkg_msg(ERROR, "%s:%d: Ignoring config line with trailing garbage: `%s'\n",
+		       filename, line_num, line);
+	  } else {
+
+	  /* We use the conf->tmp_dest_list below instead of
 	     conf->pkg_dest_list because we might encounter an
 	     offline_root option later and that would invalidate the
 	     directories we would have computed in
@@ -307,6 +287,20 @@ opkg_conf_parse_file(const char *filename,
 	     tmp_src_nv_pair_list for sake of symmetry.) */
 	  if (strcmp(type, "option") == 0) {
 	       opkg_conf_set_option(name, value);
+ 	  } else if (strcmp(type, "dist") == 0) {
+ 	       if (!nv_pair_list_find((nv_pair_list_t*) dist_src_list, name)) {
+ 		    pkg_src_list_append (dist_src_list, name, value, extra, 0);
+ 	       } else {
+ 		    opkg_msg(ERROR, "Duplicate dist declaration (%s %s). "
+ 				    "Skipping.\n", name, value);
+ 	       }
+ 	  } else if (strcmp(type, "dist/gz") == 0) {
+ 	       if (!nv_pair_list_find((nv_pair_list_t*) dist_src_list, name)) {
+ 		    pkg_src_list_append (dist_src_list, name, value, extra, 1);
+ 	       } else {
+ 		    opkg_msg(ERROR, "Duplicate dist declaration (%s %s). "
+ 				    "Skipping.\n", name, value);
+ 	       }
 	  } else if (strcmp(type, "src") == 0) {
 	       if (!nv_pair_list_find((nv_pair_list_t*) pkg_src_list, name)) {
 		    pkg_src_list_append (pkg_src_list, name, value, extra, 0);
@@ -322,7 +316,7 @@ opkg_conf_parse_file(const char *filename,
 				   "Skipping.\n", name, value);
 	       }
 	  } else if (strcmp(type, "dest") == 0) {
-	       nv_pair_list_append(tmp_dest_nv_pair_list, name, value);
+	       nv_pair_list_append(&conf->tmp_dest_list, name, value);
 	  } else if (strcmp(type, "lists_dir") == 0) {
 	       conf->lists_dir = xstrdup(value);
 	  } else if (strcmp(type, "arch") == 0) {
@@ -334,26 +328,32 @@ opkg_conf_parse_file(const char *filename,
 	       }
 	       nv_pair_list_append(&conf->arch_list, name, value);
 	  } else {
-	       opkg_msg(ERROR, "Ignoring unknown configuration "
-		       "parameter: %s %s %s\n", type, name, value);
-	       return -1;
+	       opkg_msg(ERROR, "%s:%d: Ignoring invalid line: `%s'\n",
+		       filename, line_num, line);
+	  }
+
 	  }
 
 	  free(type);
 	  free(name);
 	  free(value);
 	  if (extra)
-	       free (extra);
+	       free(extra);
 
-     NEXT_LINE:
+NEXT_LINE:
 	  free(line);
      }
 
-     regfree(&comment_re);
      regfree(&valid_line_re);
-     fclose(file);
-
-     return 0;
+err2:
+     regfree(&comment_re);
+err1:
+     if (fclose(file) == EOF) {
+          opkg_perror(ERROR, "Couldn't close %s", filename);
+	  err = -1;
+     }
+err0:
+     return err;
 }
 
 int
@@ -372,7 +372,7 @@ opkg_conf_write_status_files(void)
           dest = (pkg_dest_t *)iter->data;
 
           dest->status_fp = fopen(dest->status_file_name, "w");
-          if (dest->status_fp == NULL) {
+          if (dest->status_fp == NULL && errno != EROFS) {
                opkg_perror(ERROR, "Can't open status file %s",
                     dest->status_file_name);
                ret = -1;
@@ -387,7 +387,8 @@ opkg_conf_write_status_files(void)
 	  /* We don't need most uninstalled packages in the status file */
 	  if (pkg->state_status == SS_NOT_INSTALLED
 	      && (pkg->state_want == SW_UNKNOWN
-		  || pkg->state_want == SW_DEINSTALL
+		  || (pkg->state_want == SW_DEINSTALL
+			  && pkg->state_flag != SF_HOLD)
 		  || pkg->state_want == SW_PURGE)) {
 	       continue;
 	  }
@@ -404,7 +405,10 @@ opkg_conf_write_status_files(void)
 
      list_for_each_entry(iter, &conf->pkg_dest_list.head, node) {
           dest = (pkg_dest_t *)iter->data;
-          fclose(dest->status_fp);
+          if (dest->status_fp && fclose(dest->status_fp) == EOF) {
+               opkg_perror(ERROR, "Couldn't close %s", dest->status_file_name);
+	       ret = -1;
+          }
      }
 
      return ret;
@@ -420,158 +424,207 @@ root_filename_alloc(char *filename)
 	return root_filename;
 }
 
+static int
+glob_errfunc(const char *epath, int eerrno)
+{
+	if (eerrno == ENOENT)
+		/* If leading dir does not exist, we get GLOB_NOMATCH. */
+		return 0;
+
+	opkg_msg(ERROR, "glob failed for %s: %s\n", epath, strerror(eerrno));
+	return 0;
+}
+
 int
-opkg_conf_init(const args_t *args)
+opkg_conf_init(void)
 {
-     int err;
-     char *tmp_dir_base, *tmp2;
-     nv_pair_list_t tmp_dest_nv_pair_list;
-     char *lock_file = NULL;
-     glob_t globbuf;
-     char *etc_opkg_conf_pattern;
-
-     conf->restrict_to_default_dest = 0;
-     conf->default_dest = NULL;
+	pkg_src_list_init(&conf->pkg_src_list);
+	pkg_src_list_init(&conf->dist_src_list);
+	pkg_dest_list_init(&conf->pkg_dest_list);
+	pkg_dest_list_init(&conf->tmp_dest_list);
+	nv_pair_list_init(&conf->arch_list);
+
+	return 0;
+}
+
+int
+opkg_conf_load(void)
+{
+	int i, glob_ret;
+	char *tmp, *tmp_dir_base, **tmp_val;
+	glob_t globbuf;
+	char *etc_opkg_conf_pattern;
+
+	conf->restrict_to_default_dest = 0;
+	conf->default_dest = NULL;
 #if defined(HAVE_PATHFINDER)
-     conf->check_x509_path = 1;
+	conf->check_x509_path = 1;
 #endif
 
-     pkg_src_list_init(&conf->pkg_src_list);
+	if (!conf->offline_root)
+		conf->offline_root = xstrdup(getenv("OFFLINE_ROOT"));
 
-     nv_pair_list_init(&tmp_dest_nv_pair_list);
-     pkg_dest_list_init(&conf->pkg_dest_list);
+	if (conf->conf_file) {
+		struct stat st;
+		if (stat(conf->conf_file, &st) == -1) {
+			opkg_perror(ERROR, "Couldn't stat %s", conf->conf_file);
+			goto err0;
+		}
+		if (opkg_conf_parse_file(conf->conf_file,
+				&conf->pkg_src_list, &conf->dist_src_list))
+			goto err1;
+	}
 
-     nv_pair_list_init(&conf->arch_list);
+	if (conf->offline_root)
+		sprintf_alloc(&etc_opkg_conf_pattern, "%s/etc/opkg/*.conf", conf->offline_root);
+	else {
+		const char *conf_file_dir = getenv("OPKG_CONF_DIR");
+		if (conf_file_dir == NULL)
+			conf_file_dir = OPKG_CONF_DEFAULT_CONF_FILE_DIR;
+			sprintf_alloc(&etc_opkg_conf_pattern, "%s/*.conf", conf_file_dir);
+	}
 
-     if (args->conf_file) {
-	  struct stat stat_buf;
-	  err = stat(args->conf_file, &stat_buf);
-	  if (err == 0)
-	       if (opkg_conf_parse_file(args->conf_file,
-				    &conf->pkg_src_list, &tmp_dest_nv_pair_list)<0) {
-                   /* Memory leakage from opkg_conf_parse-file */
-                   return -1;
-               }
-     }
+	memset(&globbuf, 0, sizeof(globbuf));
+	glob_ret = glob(etc_opkg_conf_pattern, 0, glob_errfunc, &globbuf);
+	if (glob_ret && glob_ret != GLOB_NOMATCH) {
+		free(etc_opkg_conf_pattern);
+		globfree(&globbuf);
+		goto err1;
+	}
 
-     if (conf->offline_root)
-	  sprintf_alloc(&etc_opkg_conf_pattern, "%s/etc/opkg/*.conf", conf->offline_root);
-     else {
-	  const char *conf_file_dir = getenv("OPKG_CONF_DIR");
-	  if (conf_file_dir == NULL)
-		  conf_file_dir = ARGS_DEFAULT_CONF_FILE_DIR;
-	  sprintf_alloc(&etc_opkg_conf_pattern, "%s/*.conf", conf_file_dir);
-     }
-     memset(&globbuf, 0, sizeof(globbuf));
-     err = glob(etc_opkg_conf_pattern, 0, NULL, &globbuf);
-     free (etc_opkg_conf_pattern);
-     if (!err) {
-	  int i;
-	  for (i = 0; i < globbuf.gl_pathc; i++) {
-	       if (globbuf.gl_pathv[i]) 
-		    if (args->conf_file &&
-				!strcmp(args->conf_file, globbuf.gl_pathv[i]))
-			    continue;
-		    if ( opkg_conf_parse_file(globbuf.gl_pathv[i], 
-				         &conf->pkg_src_list, &tmp_dest_nv_pair_list)<0) {
-                        /* Memory leakage from opkg_conf_parse-file */
-                        return -1;
-	            }
-	  }
-     }
-     globfree(&globbuf);
-
-     /* check for lock file */
-     if (conf->offline_root)
-       sprintf_alloc (&lock_file, "%s/%s/lock", conf->offline_root, OPKG_STATE_DIR_PREFIX);
-     else
-       sprintf_alloc (&lock_file, "%s/lock", OPKG_STATE_DIR_PREFIX);
-
-     if (creat(lock_file, S_IRUSR | S_IWUSR | S_IRGRP) == -1) {
-	     opkg_perror(ERROR, "Could not create lock file %s", lock_file);
-	     free(lock_file);
-	     return -1;
-     }
+	free(etc_opkg_conf_pattern);
+
+	for (i = 0; i < globbuf.gl_pathc; i++) {
+		if (globbuf.gl_pathv[i])
+			if (conf->conf_file &&
+					!strcmp(conf->conf_file, globbuf.gl_pathv[i]))
+				continue;
+		if ( opkg_conf_parse_file(globbuf.gl_pathv[i],
+			&conf->pkg_src_list, &conf->dist_src_list)<0) {
+			globfree(&globbuf);
+			goto err1;
+		}
+	}
 
-     if (lockf(lock_fd, F_TLOCK, (off_t)0) == -1) {
-	  opkg_perror(ERROR, "Could not lock %s", lock_file);
-	  free(lock_file);
-	  return -1;
-     }
+	globfree(&globbuf);
 
-     free(lock_file);
-
-     if (conf->tmp_dir)
-	  tmp_dir_base = conf->tmp_dir;
-     else 
-	  tmp_dir_base = getenv("TMPDIR");
-     sprintf_alloc(&tmp2, "%s/%s",
-		   tmp_dir_base ? tmp_dir_base : OPKG_CONF_DEFAULT_TMP_DIR_BASE,
-		   OPKG_CONF_TMP_DIR_SUFFIX);
-     if (conf->tmp_dir)
-	     free(conf->tmp_dir);
-     conf->tmp_dir = mkdtemp(tmp2);
-     if (conf->tmp_dir == NULL) {
-	  opkg_perror(ERROR, "Creating temp dir %s failed", tmp2);
-	  return -1;
-     }
+	if (conf->offline_root)
+		sprintf_alloc (&lock_file, "%s/%s", conf->offline_root, OPKGLOCKFILE);
+	else
+		sprintf_alloc (&lock_file, "%s", OPKGLOCKFILE);
 
-     pkg_hash_init();
-     hash_table_init("file-hash", &conf->file_hash, OPKG_CONF_DEFAULT_HASH_LEN);
-     hash_table_init("obs-file-hash", &conf->obs_file_hash, OPKG_CONF_DEFAULT_HASH_LEN/16);
+	lock_fd = creat(lock_file, S_IRUSR | S_IWUSR | S_IRGRP);
+	if (lock_fd == -1) {
+		opkg_perror(ERROR, "Could not create lock file %s", lock_file);
+		goto err2;
+	}
 
-     if (conf->lists_dir == NULL)
-        conf->lists_dir = xstrdup(OPKG_CONF_LISTS_DIR);
+	if (lockf(lock_fd, F_TLOCK, (off_t)0) == -1) {
+		opkg_perror(ERROR, "Could not lock %s", lock_file);
+		if (close(lock_fd) == -1)
+			opkg_perror(ERROR, "Couldn't close descriptor %d (%s)",
+				lock_fd, lock_file);
+		lock_fd = -1;
+		goto err2;
+	}
 
-     if (conf->offline_root) {
-            char *tmp;
-            sprintf_alloc(&tmp, "%s/%s", conf->offline_root, conf->lists_dir);
-            free(conf->lists_dir);
-            conf->lists_dir = tmp;
-     }
+	if (conf->tmp_dir)
+		tmp_dir_base = conf->tmp_dir;
+	else
+		tmp_dir_base = getenv("TMPDIR");
+
+	sprintf_alloc(&tmp, "%s/%s",
+		tmp_dir_base ? tmp_dir_base : OPKG_CONF_DEFAULT_TMP_DIR_BASE,
+		OPKG_CONF_TMP_DIR_SUFFIX);
+	if (conf->tmp_dir)
+		free(conf->tmp_dir);
+	conf->tmp_dir = mkdtemp(tmp);
+	if (conf->tmp_dir == NULL) {
+		opkg_perror(ERROR, "Creating temp dir %s failed", tmp);
+		goto err3;
+	}
 
-     /* if no architectures were defined, then default all, noarch, and host architecture */
-     if (nv_pair_list_empty(&conf->arch_list)) {
-	  nv_pair_list_append(&conf->arch_list, "all", "1");
-	  nv_pair_list_append(&conf->arch_list, "noarch", "1");
-	  nv_pair_list_append(&conf->arch_list, HOST_CPU_STR, "10");
-     }
+	pkg_hash_init();
+	hash_table_init("file-hash", &conf->file_hash, OPKG_CONF_DEFAULT_HASH_LEN);
+	hash_table_init("obs-file-hash", &conf->obs_file_hash, OPKG_CONF_DEFAULT_HASH_LEN/16);
 
-     /* Even if there is no conf file, we'll need at least one dest. */
-     if (nv_pair_list_empty(&tmp_dest_nv_pair_list)) {
-	  nv_pair_list_append(&tmp_dest_nv_pair_list,
-			      OPKG_CONF_DEFAULT_DEST_NAME,
-			      OPKG_CONF_DEFAULT_DEST_ROOT_DIR);
-     }
+	if (conf->lists_dir == NULL)
+		conf->lists_dir = xstrdup(OPKG_CONF_LISTS_DIR);
 
-     if (!(args->nocheckfordirorfile)) {
+	if (conf->offline_root) {
+		sprintf_alloc(&tmp, "%s/%s", conf->offline_root, conf->lists_dir);
+		free(conf->lists_dir);
+		conf->lists_dir = tmp;
+	}
 
-        if (!(args->noreadfeedsfile)) {
-           if (set_and_load_pkg_src_list(&conf->pkg_src_list)) {
-               nv_pair_list_deinit(&tmp_dest_nv_pair_list);
-	       return -1;
-	   }
+	/* if no architectures were defined, then default all, noarch, and host architecture */
+	if (nv_pair_list_empty(&conf->arch_list)) {
+		nv_pair_list_append(&conf->arch_list, "all", "1");
+		nv_pair_list_append(&conf->arch_list, "noarch", "1");
+		nv_pair_list_append(&conf->arch_list, HOST_CPU_STR, "10");
 	}
-   
-        /* Now that we have resolved conf->offline_root, we can commit to
-	   the directory names for the dests and load in all the package
-	   lists. */
-        if (set_and_load_pkg_dest_list(&tmp_dest_nv_pair_list)) {
-               nv_pair_list_deinit(&tmp_dest_nv_pair_list);
-	       return -1;
+
+	/* Even if there is no conf file, we'll need at least one dest. */
+	if (nv_pair_list_empty(&conf->tmp_dest_list)) {
+		nv_pair_list_append(&conf->tmp_dest_list,
+			OPKG_CONF_DEFAULT_DEST_NAME,
+			OPKG_CONF_DEFAULT_DEST_ROOT_DIR);
 	}
-   
-        if (args->dest) {
-	     err = opkg_conf_set_default_dest(args->dest);
-	     if (err) {
-                  nv_pair_list_deinit(&tmp_dest_nv_pair_list);
-	          return -1;
-	     }
-        }
-     }
-     nv_pair_list_deinit(&tmp_dest_nv_pair_list);
 
-     return 0;
+	if (resolve_pkg_dest_list())
+		goto err4;
+
+	nv_pair_list_deinit(&conf->tmp_dest_list);
+
+	return 0;
+
+
+err4:
+	free(conf->lists_dir);
+
+	pkg_hash_deinit();
+	hash_table_deinit(&conf->file_hash);
+	hash_table_deinit(&conf->obs_file_hash);
+
+	if (rmdir(conf->tmp_dir) == -1)
+		opkg_perror(ERROR, "Couldn't remove dir %s", conf->tmp_dir);
+err3:
+	if (lockf(lock_fd, F_ULOCK, (off_t)0) == -1)
+		opkg_perror(ERROR, "Couldn't unlock %s", lock_file);
+
+	if (close(lock_fd) == -1)
+		opkg_perror(ERROR, "Couldn't close descriptor %d (%s)",
+				lock_fd, lock_file);
+	if (unlink(lock_file) == -1)
+		opkg_perror(ERROR, "Couldn't unlink %s", lock_file);
+err2:
+	if (lock_file) {
+		free(lock_file);
+		lock_file = NULL;
+	}
+err1:
+	pkg_src_list_deinit(&conf->pkg_src_list);
+	pkg_src_list_deinit(&conf->dist_src_list);
+	pkg_dest_list_deinit(&conf->pkg_dest_list);
+	nv_pair_list_deinit(&conf->arch_list);
+
+	for (i=0; options[i].name; i++) {
+		if (options[i].type == OPKG_OPT_TYPE_STRING) {
+			tmp_val = (char **)options[i].value;
+			if (*tmp_val) {
+				free(*tmp_val);
+				*tmp_val = NULL;
+			}
+		}
+	}
+err0:
+	nv_pair_list_deinit(&conf->tmp_dest_list);
+	if (conf->dest_str)
+		free(conf->dest_str);
+	if (conf->conf_file)
+		free(conf->conf_file);
+
+	return -1;
 }
 
 void
@@ -580,11 +633,20 @@ opkg_conf_deinit(void)
 	int i;
 	char **tmp;
 
-	rm_r(conf->tmp_dir);
+	if (conf->tmp_dir)
+		rm_r(conf->tmp_dir);
 
-	free(conf->lists_dir);
+	if (conf->lists_dir)
+		free(conf->lists_dir);
+
+	if (conf->dest_str)
+		free(conf->dest_str);
+
+	if (conf->conf_file)
+		free(conf->conf_file);
 
 	pkg_src_list_deinit(&conf->pkg_src_list);
+	pkg_src_list_deinit(&conf->dist_src_list);
 	pkg_dest_list_deinit(&conf->pkg_dest_list);
 	nv_pair_list_deinit(&conf->arch_list);
 
@@ -598,23 +660,30 @@ opkg_conf_deinit(void)
 		}
 	}
 
-	if (conf->verbosity >= DEBUG) { 
+	if (conf->verbosity >= DEBUG) {
 		hash_print_stats(&conf->pkg_hash);
 		hash_print_stats(&conf->file_hash);
 		hash_print_stats(&conf->obs_file_hash);
 	}
 
-	if (&conf->pkg_hash)
-		pkg_hash_deinit();
-	if (&conf->file_hash)
-		hash_table_deinit(&conf->file_hash);
-	if (&conf->obs_file_hash)
-		hash_table_deinit(&conf->obs_file_hash);
+	pkg_hash_deinit();
+	hash_table_deinit(&conf->file_hash);
+	hash_table_deinit(&conf->obs_file_hash);
+
+	if (lock_fd != -1) {
+		if (lockf(lock_fd, F_ULOCK, (off_t)0) == -1)
+			opkg_perror(ERROR, "Couldn't unlock %s", lock_file);
+
+		if (close(lock_fd) == -1)
+			opkg_perror(ERROR, "Couldn't close descriptor %d (%s)",
+					lock_fd, lock_file);
 
-	/* lockf may be defined with warn_unused_result */
-	if (lockf(lock_fd, F_ULOCK, (off_t)0) != 0) {
-		opkg_perror(ERROR, "unlock failed");
 	}
 
-	close(lock_fd);
+	if (lock_file) {
+		if (unlink(lock_file) == -1)
+			opkg_perror(ERROR, "Couldn't unlink %s", lock_file);
+
+		free(lock_file);
+	}
 }