From e7f6a9884fa0a2c327e6ef087c176cf2d157667b Mon Sep 17 00:00:00 2001
From: "graham.gower" <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
Date: Mon, 23 Nov 2009 02:15:01 +0000
Subject: [PATCH] Add opkg config file option for tmp_dir.

Requested by Mike Westerhof for small memory systems where /tmp is a memory
file system.

Add, e.g. the following to your opkg config file:
option tmp_dir /tmp/frob

git-svn-id: http://opkg.googlecode.com/svn/trunk@348 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
---
 libopkg/args.c      |  1 +
 libopkg/opkg_conf.c | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/libopkg/args.c b/libopkg/args.c
index 3f1e3ce..263078a 100644
--- a/libopkg/args.c
+++ b/libopkg/args.c
@@ -138,6 +138,7 @@ int args_parse(args_t *args, int argc, char *argv[])
 	  {"offline-root-path", 1, 0, 'p'},
 	  {"test", 0, 0, ARGS_OPT_NOACTION},
 	  {"tmp-dir", 1, 0, 't'},
+	  {"tmp_dir", 1, 0, 't'},
 	  {"verbosity", 2, 0, 'V'},
 	  {"version", 0, 0, 'v'},
 	  {0, 0, 0, 0}
diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index 04be3df..3b4378f 100644
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -71,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 },
@@ -119,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;
@@ -198,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)
@@ -218,18 +220,20 @@ 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;
      }
 
-- 
2.25.1