Add overlay_root config option. Opkg checks this location for available space.

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

diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index 22c99ebde86c2ce2d563a3f7a9eb830c7ab73744..864d2ac30992c43a6b9478dbd93acdb6b929f391 100644 (file)
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -63,6 +63,7 @@ opkg_option_t options[] = {
          { "download_only", OPKG_OPT_TYPE_BOOL, &_conf.download_only },
          { "nodeps", OPKG_OPT_TYPE_BOOL, &_conf.nodeps },
          { "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 },
@@ -495,6 +496,7 @@ opkg_conf_load(void)
                if (close(lock_fd) == -1)
                        opkg_perror(ERROR, "Couldn't close descriptor %d (%s)",
                                lock_fd, lock_file);
+               lock_fd = -1;
                goto err2;
        }
 
@@ -568,7 +570,10 @@ err3:
        if (unlink(lock_file) == -1)
                opkg_perror(ERROR, "Couldn't unlink %s", lock_file);
 err2:
-       free(lock_file);
+       if (lock_file) {
+               free(lock_file);
+               lock_file = NULL;
+       }
 err1:
        pkg_src_list_deinit(&conf->pkg_src_list);
        pkg_dest_list_deinit(&conf->pkg_dest_list);
@@ -599,9 +604,11 @@ 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);
@@ -633,15 +640,20 @@ opkg_conf_deinit(void)
        hash_table_deinit(&conf->file_hash);
        hash_table_deinit(&conf->obs_file_hash);
 
-       if (lockf(lock_fd, F_ULOCK, (off_t)0) == -1)
-               opkg_perror(ERROR, "Couldn't unlock %s", lock_file);
+       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);
+               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);
+       }
 
-       free(lock_file);
+       if (lock_file) {
+               if (unlink(lock_file) == -1)
+                       opkg_perror(ERROR, "Couldn't unlink %s", lock_file);
+
+               free(lock_file);
+       }
 }