Remove list_pending command. Undocumented and the pending_dir was unpopulated.

[oweals/opkg-lede.git] / libopkg / opkg_conf.c

diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index bd73317a4f145dac1578efd0eb1b4c58581cf1d2..238754cecfb599882d055ea7d78afb5f348fdf24 100644 (file)
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -25,7 +25,6 @@
 #include "opkg_message.h"
 #include "file_util.h"
 #include "str_util.h"
-#include "xsystem.h"
 #include "opkg_defines.h"
 #include "libbb/libbb.h"
 
@@ -72,6 +71,7 @@ void opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options)
          { "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 },
+         { "tmp_dir", OPKG_OPT_TYPE_STRING, &conf->tmp_dir },
          { "verbosity", OPKG_OPT_TYPE_BOOL, &conf->verbosity },
 #if defined(HAVE_OPENSSL)
          { "signature_ca_file", OPKG_OPT_TYPE_STRING, &conf->signature_ca_file },
@@ -120,7 +120,7 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
 {
      int err;
      int errno_copy;
-     char *tmp_dir_base;
+     char *tmp_dir_base, *tmp2;
      nv_pair_list_t tmp_dest_nv_pair_list;
      char *lock_file = NULL;
      glob_t globbuf;
@@ -199,6 +199,7 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
                               args->offline_root_post_script_cmd);
 
      opkg_conf_override_string(&conf->cache, args->cache);
+     opkg_conf_override_string(&conf->tmp_dir, args->tmp_dir);
 
      /* check for lock file */
      if (conf->offline_root)
@@ -219,24 +220,26 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
      }
      free(lock_file);
 
-     if (args->tmp_dir)
-         tmp_dir_base = args->tmp_dir;
+     if (conf->tmp_dir)
+         tmp_dir_base = conf->tmp_dir;
      else 
          tmp_dir_base = getenv("TMPDIR");
-     sprintf_alloc(&conf->tmp_dir, "%s/%s",
+     sprintf_alloc(&tmp2, "%s/%s",
                   tmp_dir_base ? tmp_dir_base : OPKG_CONF_DEFAULT_TMP_DIR_BASE,
                   OPKG_CONF_TMP_DIR_SUFFIX);
-     conf->tmp_dir = mkdtemp(conf->tmp_dir);
+     if (conf->tmp_dir)
+            free(conf->tmp_dir);
+     conf->tmp_dir = mkdtemp(tmp2);
      if (conf->tmp_dir == NULL) {
          opkg_message(conf, OPKG_ERROR,
                          "%s: Creating temp dir %s failed: %s\n",
-                         conf->tmp_dir, strerror(errno));
+                         __FUNCTION__, tmp2, 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);
+     hash_table_init("obs-file-hash", &conf->obs_file_hash, OPKG_CONF_DEFAULT_HASH_LEN/16);
 
      if (conf->lists_dir == NULL)
         conf->lists_dir = xstrdup(OPKG_CONF_LISTS_DIR);
@@ -248,8 +251,6 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
             conf->lists_dir = tmp;
      }
 
-     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)) {
          nv_pair_list_append(&conf->arch_list, "all", "1");
@@ -345,7 +346,6 @@ void opkg_conf_deinit(opkg_conf_t *conf)
 
      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);
@@ -382,31 +382,9 @@ void opkg_conf_deinit(opkg_conf_t *conf)
 #endif
 
      if (conf->verbosity >= OPKG_DEBUG) { 
-         int i;
-         hash_table_t *hashes[] = {
-              &conf->pkg_hash,
-              &conf->file_hash,
-              &conf->obs_file_hash };
-         for (i = 0; i < 3; i++) {
-              hash_table_t *hash = hashes[i];
-              int c = 0;
-              int n_conflicts = 0;
-              int j;
-              for (j = 0; j < hash->n_entries; j++) {
-                   int len = 0;
-                   hash_entry_t *e = &hash->entries[j];
-                   if (e->next)
-                        n_conflicts++;
-                   while (e && e->key) {
-                        len++;
-                        e = e->next;
-                   }
-                   if (len > c) 
-                        c = len;
-              }
-              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_print_stats(&conf->pkg_hash);
+       hash_print_stats(&conf->file_hash);
+       hash_print_stats(&conf->obs_file_hash);
      }
 
      if (&conf->pkg_hash)
@@ -416,7 +394,12 @@ void opkg_conf_deinit(opkg_conf_t *conf)
      if (&conf->obs_file_hash)
                    hash_table_deinit(&conf->obs_file_hash);
 
-     lockf(conf->lock_fd, F_ULOCK, 0);
+     /* lockf maybe defined with warn_unused_result */
+     if(lockf(conf->lock_fd, F_ULOCK, 0) != 0){
+              opkg_message(conf, OPKG_DEBUG, "%s: unlock failed: %s\n",
+                              __FUNCTION__, 
+                              strerror(errno));
+     }
      close(conf->lock_fd);
 }