X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libopkg%2Fopkg_conf.c;h=dc2c5f9ea414cba098aa79cfc696da55da484276;hb=51e968e4ddffd4acd7c71e4976e1254a590f2217;hp=1312c417165189b1841930fa80cd0276ad0c041e;hpb=e5cfa6dc4794e0a5bca36cabcd12a877454478db;p=oweals%2Fopkg-lede.git

diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index 1312c41..dc2c5f9 100644
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -26,20 +26,18 @@
 #include "file_util.h"
 #include "str_util.h"
 #include "xsystem.h"
-#include <glob.h>
 #include "opkg_defines.h"
+#include "libbb/libbb.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
-
-extern char *conf_file_dir;
+#include <glob.h>
 
 static int opkg_conf_parse_file(opkg_conf_t *conf, const char *filename,
 				pkg_src_list_t *pkg_src_list,
-				nv_pair_list_t *tmp_dest_nv_pair_list,
-				char **tmp_lists_dir);
+				nv_pair_list_t *tmp_dest_nv_pair_list);
 static int opkg_conf_set_option(const opkg_option_t *options,
 				const char *name, const char *value);
 static int opkg_conf_set_default_dest(opkg_conf_t *conf,
@@ -47,9 +45,9 @@ static int opkg_conf_set_default_dest(opkg_conf_t *conf,
 static int set_and_load_pkg_src_list(opkg_conf_t *conf,
 				     pkg_src_list_t *nv_pair_list);
 static int set_and_load_pkg_dest_list(opkg_conf_t *conf,
-				      nv_pair_list_t *nv_pair_list, char * lists_dir);
+				      nv_pair_list_t *nv_pair_list);
 
-int opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options)
+void opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options)
 {
      opkg_option_t tmp[] = {
 	  { "cache", OPKG_OPT_TYPE_STRING, &conf->cache},
@@ -75,19 +73,29 @@ int opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options)
 	  { "proxy_user", OPKG_OPT_TYPE_STRING, &conf->proxy_user },
 	  { "query-all", OPKG_OPT_TYPE_BOOL, &conf->query_all },
 	  { "verbosity", OPKG_OPT_TYPE_BOOL, &conf->verbosity },
+#if defined(HAVE_OPENSSL)
 	  { "signature_ca_file", OPKG_OPT_TYPE_STRING, &conf->signature_ca_file },
 	  { "signature_ca_path", OPKG_OPT_TYPE_STRING, &conf->signature_ca_path },
+#endif
+#if defined(HAVE_PATHFINDER)
+          { "check_x509_path", OPKG_OPT_TYPE_INT, &conf->check_x509_path }, 
+#endif
+#if defined(HAVE_SSLCURL) && defined(HAVE_CURL)
+          { "ssl_engine", OPKG_OPT_TYPE_STRING, &conf->ssl_engine },
+          { "ssl_cert", OPKG_OPT_TYPE_STRING, &conf->ssl_cert },
+          { "ssl_cert_type", OPKG_OPT_TYPE_STRING, &conf->ssl_cert_type },
+          { "ssl_key", OPKG_OPT_TYPE_STRING, &conf->ssl_key },
+          { "ssl_key_type", OPKG_OPT_TYPE_STRING, &conf->ssl_key_type },
+          { "ssl_key_passwd", OPKG_OPT_TYPE_STRING, &conf->ssl_key_passwd },
+          { "ssl_ca_file", OPKG_OPT_TYPE_STRING, &conf->ssl_ca_file },
+          { "ssl_ca_path", OPKG_OPT_TYPE_STRING, &conf->ssl_ca_path },
+          { "ssl_dont_verify_peer", OPKG_OPT_TYPE_BOOL, &conf->ssl_dont_verify_peer },
+#endif
 	  { NULL }
      };
 
-     *options = (opkg_option_t *)calloc(1, sizeof(tmp));
-     if ( options == NULL ){
-        fprintf(stderr,"%s: Unable to allocate memory\n",__FUNCTION__);
-        return -1;
-     }
-
+     *options = xcalloc(1, sizeof(tmp));
      memcpy(*options, tmp, sizeof(tmp));
-     return 0;
 };
 
 static void opkg_conf_override_string(char **conf_str, char *arg_str) 
@@ -96,7 +104,7 @@ static void opkg_conf_override_string(char **conf_str, char *arg_str)
 	  if (*conf_str) {
 	       free(*conf_str);
 	  }
-	  *conf_str = strdup(arg_str);
+	  *conf_str = xstrdup(arg_str);
      }
 }
 
@@ -114,13 +122,17 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
      int errno_copy;
      char *tmp_dir_base;
      nv_pair_list_t tmp_dest_nv_pair_list;
-     char *lists_dir = NULL, *lock_file = NULL;
+     char *lock_file = NULL;
      glob_t globbuf;
      char *etc_opkg_conf_pattern;
-     char *pending_dir = NULL;
+     char *offline_root = NULL;
 
      memset(conf, 0, sizeof(opkg_conf_t));
 
+#if defined(HAVE_PATHFINDER)
+     conf->check_x509_path = 1;
+#endif
+
      pkg_src_list_init(&conf->pkg_src_list);
 
      nv_pair_list_init(&tmp_dest_nv_pair_list);
@@ -131,29 +143,81 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
      conf->restrict_to_default_dest = 0;
      conf->default_dest = NULL;
 
+     if (args->conf_file) {
+	  struct stat stat_buf;
+	  err = stat(args->conf_file, &stat_buf);
+	  if (err == 0)
+	       if (opkg_conf_parse_file(conf, args->conf_file,
+				    &conf->pkg_src_list, &tmp_dest_nv_pair_list)<0) {
+                   /* Memory leakage from opkg_conf_parse-file */
+                   return OPKG_CONF_ERR_PARSE;
+               }
+     }
+
+     offline_root = conf->offline_root;
+     opkg_conf_override_string(&conf->offline_root, args->offline_root);
+
+     if (conf->offline_root)
+	  sprintf_alloc(&etc_opkg_conf_pattern, "%s/etc/opkg/*.conf", conf->offline_root);
+     else {
+	  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(conf, globbuf.gl_pathv[i], 
+				         &conf->pkg_src_list, &tmp_dest_nv_pair_list)<0) {
+                        /* Memory leakage from opkg_conf_parse-file */
+                        return OPKG_CONF_ERR_PARSE;
+	            }
+                    if (offline_root != conf->offline_root) {
+                        opkg_message(conf, OPKG_ERROR,
+					"Config file %s, within an offline "
+					"root contains option offline_root.\n",
+				       globbuf.gl_pathv[i]);
+                        return OPKG_CONF_ERR_PARSE;
+                    }
+	  }
+     }
+     globfree(&globbuf);
+
+     opkg_conf_override_string(&conf->offline_root_path, 
+			       args->offline_root_path);
+     opkg_conf_override_string(&conf->offline_root_pre_script_cmd, 
+			       args->offline_root_pre_script_cmd);
+     opkg_conf_override_string(&conf->offline_root_post_script_cmd, 
+			       args->offline_root_post_script_cmd);
+
+     opkg_conf_override_string(&conf->cache, args->cache);
+
      /* check for lock file */
-     if (args->offline_root)
-       sprintf_alloc (&lock_file, "%s/%s/lock", args->offline_root, OPKG_STATE_DIR_PREFIX);
+     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);
 
-     conf->lock_fd = creat (lock_file, S_IRUSR | S_IWUSR | S_IRGRP);
-     err = lockf (conf->lock_fd, F_TLOCK, 0);
+     err = conf->lock_fd = creat (lock_file, S_IRUSR | S_IWUSR | S_IRGRP);
+     if (err != -1)
+       err = lockf (conf->lock_fd, F_TLOCK, 0);
      errno_copy = errno;
 
-     free (lock_file);
-
-     if (err)
-     {
-       if(args->offline_root) {
-         opkg_message (conf, OPKG_ERROR, "Could not obtain administrative lock for offline root (ERR: %s)  at %s/%s/lock\n",
-                 strerror(errno_copy), args->offline_root, OPKG_STATE_DIR_PREFIX);
-       } else {
-         opkg_message (conf, OPKG_ERROR, "Could not obtain administrative lock (ERR: %s) at %s/lock\n",
-                 strerror(errno_copy), OPKG_STATE_DIR_PREFIX);
-       }
+     if (err) {
+       opkg_message (conf, OPKG_ERROR, "Could not lock %s: %s\n",
+                 lock_file, strerror(errno_copy));
+       free(lock_file);
        return OPKG_CONF_ERR_LOCK;
      }
+     free(lock_file);
 
      if (args->tmp_dir)
 	  tmp_dir_base = args->tmp_dir;
@@ -164,64 +228,27 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
 		   OPKG_CONF_TMP_DIR_SUFFIX);
      conf->tmp_dir = mkdtemp(conf->tmp_dir);
      if (conf->tmp_dir == NULL) {
-	  fprintf(stderr, "%s: Failed to create temporary directory `%s': %s\n",
-		  __FUNCTION__, conf->tmp_dir, strerror(errno));
+	  opkg_message(conf, OPKG_ERROR,
+			  "%s: Creating temp dir %s failed: %s\n",
+			  conf->tmp_dir, strerror(errno));
 	  return OPKG_CONF_ERR_TMP_DIR;
      }
 
      pkg_hash_init("pkg-hash", &conf->pkg_hash, OPKG_CONF_DEFAULT_HASH_LEN);
      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);
-     lists_dir=(char *)malloc(1);
-     lists_dir[0]='\0';
-     if (args->conf_file) {
-	  struct stat stat_buf;
-	  err = stat(args->conf_file, &stat_buf);
-	  if (err == 0)
-	       if (opkg_conf_parse_file(conf, args->conf_file,
-				    &conf->pkg_src_list, &tmp_dest_nv_pair_list,&lists_dir)<0) {
-                   /* Memory leakage from opkg_conf_parse-file */
-                   return OPKG_CONF_ERR_PARSE;
-               }
-     }
 
-     if (strlen(lists_dir)<=1 ){
-        lists_dir = realloc(lists_dir,strlen(OPKG_CONF_LISTS_DIR)+2);
-        sprintf (lists_dir,"%s",OPKG_CONF_LISTS_DIR);
-     }
+     if (conf->lists_dir == NULL)
+        conf->lists_dir = xstrdup(OPKG_CONF_LISTS_DIR);
 
-     if (args->offline_root) {
+     if (conf->offline_root) {
             char *tmp;
-            sprintf_alloc(&tmp, "%s/%s",args->offline_root,lists_dir);
-            free(lists_dir);
-            lists_dir = tmp;
+            sprintf_alloc(&tmp, "%s/%s", conf->offline_root, conf->lists_dir);
+            free(conf->lists_dir);
+            conf->lists_dir = tmp;
      }
 
-     pending_dir = calloc(1, strlen(lists_dir)+strlen("/pending")+5);
-     snprintf(pending_dir,strlen(lists_dir)+strlen("/pending") ,"%s%s",lists_dir,"/pending");
-
-     conf->lists_dir = strdup(lists_dir);
-     conf->pending_dir = strdup(pending_dir);
-
-     if (args->offline_root) 
-	  sprintf_alloc(&etc_opkg_conf_pattern, "%s/etc/opkg/*.conf", args->offline_root);
-     else
-	  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 ( opkg_conf_parse_file(conf, globbuf.gl_pathv[i], 
-				         &conf->pkg_src_list, &tmp_dest_nv_pair_list,&lists_dir)<0) {
-                        /* Memory leakage from opkg_conf_parse-file */
-                        return OPKG_CONF_ERR_PARSE;
-	            }
-	  }
-     }
-     globfree(&globbuf);
+     sprintf_alloc(&conf->pending_dir, "%s/pending", conf->lists_dir);
 
      /* if no architectures were defined, then default all, noarch, and host architecture */
      if (nv_pair_list_empty(&conf->arch_list)) {
@@ -262,6 +289,9 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
      if (args->force_downgrade) {
 	  conf->force_downgrade = 1;
      }
+     if (args->force_space) {
+	  conf->force_space = 1;
+     }
      if (args->force_reinstall) {
 	  conf->force_reinstall = 1;
      }
@@ -284,17 +314,6 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
 	  conf->verbosity = args->verbosity;
      } 
 
-     opkg_conf_override_string(&conf->offline_root, 
-			       args->offline_root);
-     opkg_conf_override_string(&conf->offline_root_path, 
-			       args->offline_root_path);
-     opkg_conf_override_string(&conf->offline_root_pre_script_cmd, 
-			       args->offline_root_pre_script_cmd);
-     opkg_conf_override_string(&conf->offline_root_post_script_cmd, 
-			       args->offline_root_post_script_cmd);
-
-     opkg_conf_override_string(&conf->cache, args->cache);
-
 /* Pigi: added a flag to disable the checking of structures if the command does not need to 
          read anything from there.
 */
@@ -306,7 +325,7 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
         /* 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. */
-        set_and_load_pkg_dest_list(conf, &tmp_dest_nv_pair_list,lists_dir);
+        set_and_load_pkg_dest_list(conf, &tmp_dest_nv_pair_list);
    
         if (args->dest) {
 	     err = opkg_conf_set_default_dest(conf, args->dest);
@@ -316,57 +335,58 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
         }
      }
      nv_pair_list_deinit(&tmp_dest_nv_pair_list);
-     free(lists_dir);
-     free(pending_dir);
 
      return 0;
 }
 
 void opkg_conf_deinit(opkg_conf_t *conf)
 {
-#ifdef OPKG_DEBUG_NO_TMP_CLEANUP
-#error
-     fprintf(stderr, "%s: Not cleaning up %s since opkg compiled "
-	     "with OPKG_DEBUG_NO_TMP_CLEANUP\n",
-	     __FUNCTION__, conf->tmp_dir);
-#else
      int err;
+     char *cmd;
 
-     err = rmdir(conf->tmp_dir);
-     if (err) {
-	  if (errno == ENOTEMPTY) {
-	       char *cmd;
-	       sprintf_alloc(&cmd, "rm -fr %s\n", conf->tmp_dir);
-	       err = xsystem(cmd);
-	       free(cmd);
-	  }
-	  if (err)
-	       fprintf(stderr, "WARNING: Unable to remove temporary directory: %s: %s\n", conf->tmp_dir, strerror(errno));
-     }
-#endif /* OPKG_DEBUG_NO_TMP_CLEANUP */
+     sprintf_alloc(&cmd, "rm -fr %s\n", conf->tmp_dir);
+     err = xsystem(cmd);
+     free(cmd);
 
-     free(conf->tmp_dir); /*XXX*/
+     free(conf->tmp_dir);
      free(conf->lists_dir);
      free(conf->pending_dir);
 
      pkg_src_list_deinit(&conf->pkg_src_list);
      pkg_dest_list_deinit(&conf->pkg_dest_list);
      nv_pair_list_deinit(&conf->arch_list);
-     if (&conf->pkg_hash)
-	            pkg_hash_deinit(&conf->pkg_hash);
-     if (&conf->file_hash)
-	            hash_table_deinit(&conf->file_hash);
-     if (&conf->obs_file_hash)
-	            hash_table_deinit(&conf->obs_file_hash);
+
+     opkg_conf_free_string(&conf->cache);
+
+     opkg_conf_free_string(&conf->ftp_proxy);
+     opkg_conf_free_string(&conf->http_proxy);
+     opkg_conf_free_string(&conf->no_proxy);
 
      opkg_conf_free_string(&conf->offline_root);
      opkg_conf_free_string(&conf->offline_root_path);
      opkg_conf_free_string(&conf->offline_root_pre_script_cmd);
      opkg_conf_free_string(&conf->offline_root_post_script_cmd);
 
-     opkg_conf_free_string(&conf->cache);
-
-     if (conf->verbosity > 1) { 
+     opkg_conf_free_string(&conf->proxy_passwd);
+     opkg_conf_free_string(&conf->proxy_user);
+
+#if defined(HAVE_OPENSSL)
+     opkg_conf_free_string(&conf->signature_ca_file);
+     opkg_conf_free_string(&conf->signature_ca_path);
+#endif
+
+#if defined(HAVE_SSLCURL)
+     opkg_conf_free_string(&conf->ssl_engine);
+     opkg_conf_free_string(&conf->ssl_cert);
+     opkg_conf_free_string(&conf->ssl_cert_type);
+     opkg_conf_free_string(&conf->ssl_key);
+     opkg_conf_free_string(&conf->ssl_key_type);
+     opkg_conf_free_string(&conf->ssl_key_passwd);
+     opkg_conf_free_string(&conf->ssl_ca_file);
+     opkg_conf_free_string(&conf->ssl_ca_path);
+#endif
+
+     if (conf->verbosity >= OPKG_DEBUG) { 
 	  int i;
 	  hash_table_t *hashes[] = {
 	       &conf->pkg_hash,
@@ -391,9 +411,15 @@ void opkg_conf_deinit(opkg_conf_t *conf)
 	       }
 	       opkg_message(conf, OPKG_DEBUG, "hash_table[%s] n_buckets=%d n_elements=%d max_conflicts=%d n_conflicts=%d\n", 
 			    hash->name, hash->n_entries, hash->n_elements, c, n_conflicts);
-	       hash_table_deinit(hash);
 	  }
      }
+
+     if (&conf->pkg_hash)
+	            pkg_hash_deinit(&conf->pkg_hash);
+     if (&conf->file_hash)
+	            hash_table_deinit(&conf->file_hash);
+     if (&conf->obs_file_hash)
+	            hash_table_deinit(&conf->obs_file_hash);
 }
 
 static int opkg_conf_set_default_dest(opkg_conf_t *conf,
@@ -441,7 +467,7 @@ static int set_and_load_pkg_src_list(opkg_conf_t *conf, pkg_src_list_t *pkg_src_
      return 0;
 }
 
-static int set_and_load_pkg_dest_list(opkg_conf_t *conf, nv_pair_list_t *nv_pair_list, char *lists_dir )
+static int set_and_load_pkg_dest_list(opkg_conf_t *conf, nv_pair_list_t *nv_pair_list)
 {
      nv_pair_list_elt_t *iter;
      nv_pair_t *nv_pair;
@@ -454,9 +480,9 @@ static int set_and_load_pkg_dest_list(opkg_conf_t *conf, nv_pair_list_t *nv_pair
 	  if (conf->offline_root) {
 	       sprintf_alloc(&root_dir, "%s%s", conf->offline_root, nv_pair->value);
 	  } else {
-	       root_dir = strdup(nv_pair->value);
+	       root_dir = xstrdup(nv_pair->value);
 	  }
-	  dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, lists_dir);
+	  dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, conf->lists_dir);
 	  free(root_dir);
 	  if (dest == NULL) {
 	       continue;
@@ -475,24 +501,23 @@ static int set_and_load_pkg_dest_list(opkg_conf_t *conf, nv_pair_list_t *nv_pair
 
 static int opkg_conf_parse_file(opkg_conf_t *conf, const char *filename,
 				pkg_src_list_t *pkg_src_list,
-				nv_pair_list_t *tmp_dest_nv_pair_list,
-				char **lists_dir)
+				nv_pair_list_t *tmp_dest_nv_pair_list)
 {
      int err;
      opkg_option_t * options;
-     FILE *file = fopen(filename, "r");
+     FILE *file;
      regex_t valid_line_re, comment_re;
 #define regmatch_size 12
      regmatch_t regmatch[regmatch_size];
 
-     if (opkg_init_options_array(conf, &options)<0)
-        return ENOMEM;
+     opkg_init_options_array(conf, &options);
 
+     file = fopen(filename, "r");
      if (file == NULL) {
 	  fprintf(stderr, "%s: failed to open %s: %s\n",
 		  __FUNCTION__, filename, strerror(errno));
 	  free(options);
-	  return errno;
+	  return -1;
      }
      opkg_message(conf, OPKG_NOTICE, "loading conf file %s\n", filename);
 
@@ -501,12 +526,12 @@ static int opkg_conf_parse_file(opkg_conf_t *conf, const char *filename,
 		    REG_EXTENDED);
      if (err) {
 	  free(options);
-	  return err;
+	  return -1;
      }
      err = xregcomp(&valid_line_re, "^[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))([[:space:]]+([^[:space:]]+))?[[:space:]]*$", REG_EXTENDED);
      if (err) {
 	  free(options);
-	  return err;
+	  return -1;
      }
 
      while(1) {
@@ -535,29 +560,29 @@ static int opkg_conf_parse_file(opkg_conf_t *conf, const char *filename,
 
 	  /* This has to be so ugly to deal with optional quotation marks */
 	  if (regmatch[2].rm_so > 0) {
-	       type = strndup(line + regmatch[2].rm_so,
+	       type = xstrndup(line + regmatch[2].rm_so,
 			      regmatch[2].rm_eo - regmatch[2].rm_so);
 	  } else {
-	       type = strndup(line + regmatch[3].rm_so,
+	       type = xstrndup(line + regmatch[3].rm_so,
 			      regmatch[3].rm_eo - regmatch[3].rm_so);
 	  }
 	  if (regmatch[5].rm_so > 0) {
-	       name = strndup(line + regmatch[5].rm_so,
+	       name = xstrndup(line + regmatch[5].rm_so,
 			      regmatch[5].rm_eo - regmatch[5].rm_so);
 	  } else {
-	       name = strndup(line + regmatch[6].rm_so,
+	       name = xstrndup(line + regmatch[6].rm_so,
 			      regmatch[6].rm_eo - regmatch[6].rm_so);
 	  }
 	  if (regmatch[8].rm_so > 0) {
-	       value = strndup(line + regmatch[8].rm_so,
+	       value = xstrndup(line + regmatch[8].rm_so,
 			       regmatch[8].rm_eo - regmatch[8].rm_so);
 	  } else {
-	       value = strndup(line + regmatch[9].rm_so,
+	       value = xstrndup(line + regmatch[9].rm_so,
 			       regmatch[9].rm_eo - regmatch[9].rm_so);
 	  }
 	  extra = NULL;
 	  if (regmatch[11].rm_so > 0) {
-	       extra = strndup (line + regmatch[11].rm_so,
+	       extra = xstrndup (line + regmatch[11].rm_so,
 				regmatch[11].rm_eo - regmatch[11].rm_so);
 	  }
 
@@ -586,25 +611,19 @@ static int opkg_conf_parse_file(opkg_conf_t *conf, const char *filename,
 	  } else if (strcmp(type, "dest") == 0) {
 	       nv_pair_list_append(tmp_dest_nv_pair_list, name, value);
 	  } else if (strcmp(type, "lists_dir") == 0) {
-	       *lists_dir = realloc(*lists_dir,strlen(value)+1);
-               if (*lists_dir == NULL) {
-		    opkg_message(conf, OPKG_ERROR, "ERROR: Not enough memory\n");
-	            free(options);
-	            return EINVAL;
-               }
-               sprintf (*lists_dir,"%s",value);
+	       conf->lists_dir = xstrdup(value);
 	  } else if (strcmp(type, "arch") == 0) {
 	       opkg_message(conf, OPKG_INFO, "supported arch %s priority (%s)\n", name, value);
 	       if (!value) {
 		    opkg_message(conf, OPKG_NOTICE, "defaulting architecture %s priority to 10\n", name);
-		    value = strdup("10");
+		    value = xstrdup("10");
 	       }
 	       nv_pair_list_append(&conf->arch_list, name, value);
 	  } else {
 	       fprintf(stderr, "WARNING: Ignoring unknown configuration "
 		       "parameter: %s %s %s\n", type, name, value);
 	       free(options);
-	       return EINVAL;
+	       return -1;
 	  }
 
 	  free(type);
@@ -646,7 +665,7 @@ static int opkg_conf_set_option(const opkg_option_t *options,
 		    }		    
 	       case OPKG_OPT_TYPE_STRING:
 		    if (value) {
-			 *((char **)options[i].value) = strdup(value);
+			 *((char **)options[i].value) = xstrdup(value);
 			 return 0;
 		    } else {
 			 printf("%s: Option %s need an argument\n",
@@ -669,17 +688,18 @@ int opkg_conf_write_status_files(opkg_conf_t *conf)
      pkg_vec_t *all;
      pkg_t *pkg;
      int i;
-     int err;
-     FILE * status_file=NULL;
+     FILE *fp;
 
      if (conf->noaction)
 	  return 0;
 
      dest = (pkg_dest_t *)void_list_first(&conf->pkg_dest_list)->data;
-     status_file = fopen(dest->status_file_tmp_name, "w");
-     if (status_file == NULL) {
+
+     fp = fopen(dest->status_file_name, "w");
+     if (fp == NULL) {
          fprintf(stderr, "%s: Can't open status file: %s for writing: %s\n",
-                 __FUNCTION__, dest->status_file_tmp_name, strerror(errno));
+                 __FUNCTION__, dest->status_file_name, strerror(errno));
+	 return -1;
      }
 
      all = pkg_vec_alloc();
@@ -694,34 +714,18 @@ int opkg_conf_write_status_files(opkg_conf_t *conf)
 		  || pkg->state_want == SW_PURGE)) {
 	       continue;
 	  }
-	  if (!pkg) {
-	    fprintf(stderr, "Null package\n");
-	  }
 	  if (pkg->dest == NULL) {
 	       fprintf(stderr, "%s: ERROR: Can't write status for "
 		       "package %s since it has a NULL dest\n",
 		       __FUNCTION__, pkg->name);
 	       continue;
 	  }
-	  if (status_file) {
-	       pkg_print_status(pkg, status_file);
-	  }
+	  pkg_print_status(pkg, fp);
      }
 
      pkg_vec_free(all);
+     fclose(fp);
 
-     if (status_file) {
-         err = ferror(status_file);
-         fclose(status_file);
-         if (!err) {
-             file_move(dest->status_file_tmp_name, dest->status_file_name);
-         } else {
-             fprintf(stderr, "%s: ERROR: An error has occurred writing %s, "
-                     "retaining old %s\n", __FUNCTION__,
-                     dest->status_file_tmp_name, dest->status_file_name);
-         }
-         status_file = NULL;
-     }
      return 0;
 }