file_util.c cleanups. Remove redundant str_chomp from str_util.c.

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

diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index 3b4378f64acae4a78c4e7aa4d9417a4784941514..193ae5c66d286818e69c7c23b2285381002e132b 100644 (file)
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -251,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");
@@ -320,19 +318,27 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
 /* Pigi: added a flag to disable the checking of structures if the command does not need to 
          read anything from there.
 */
-     if ( !(args->nocheckfordirorfile)){
-        /* need to run load the source list before dest list -Jamey */
-        if ( !(args->noreadfeedsfile))
-           set_and_load_pkg_src_list(conf, &conf->pkg_src_list);
+     if (!(args->nocheckfordirorfile)) {
+
+        if (!(args->noreadfeedsfile)) {
+           if (set_and_load_pkg_src_list(conf, &conf->pkg_src_list)) {
+               nv_pair_list_deinit(&tmp_dest_nv_pair_list);
+              return -1;
+          }
+       }
    
         /* 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);
+        if (set_and_load_pkg_dest_list(conf, &tmp_dest_nv_pair_list)) {
+               nv_pair_list_deinit(&tmp_dest_nv_pair_list);
+              return -1;
+       }
    
         if (args->dest) {
             err = opkg_conf_set_default_dest(conf, args->dest);
             if (err) {
+                  nv_pair_list_deinit(&tmp_dest_nv_pair_list);
                  return OPKG_CONF_ERR_DEFAULT_DEST;
             }
         }
@@ -348,7 +354,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);
@@ -426,7 +431,8 @@ static int opkg_conf_set_default_dest(opkg_conf_t *conf,
      return 1;
 }
 
-static int set_and_load_pkg_src_list(opkg_conf_t *conf, pkg_src_list_t *pkg_src_list)
+static int
+set_and_load_pkg_src_list(opkg_conf_t *conf, pkg_src_list_t *pkg_src_list)
 {
      pkg_src_list_elt_t *iter;
      pkg_src_t *src;
@@ -443,7 +449,10 @@ static int set_and_load_pkg_src_list(opkg_conf_t *conf, pkg_src_list_t *pkg_src_
                          src->name);
 
          if (file_exists(list_file)) {
-              pkg_hash_add_from_file(conf, list_file, src, NULL, 0);
+              if (pkg_hash_add_from_file(conf, list_file, src, NULL, 0)) {
+                   free(list_file);
+                   return -1;
+              }
          }
          free(list_file);
      }
@@ -451,7 +460,8 @@ 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)
+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;
@@ -475,8 +485,9 @@ static int set_and_load_pkg_dest_list(opkg_conf_t *conf, nv_pair_list_t *nv_pair
               conf->default_dest = dest;
          }
          if (file_exists(dest->status_file_name)) {
-              pkg_hash_add_from_file(conf, dest->status_file_name,
-                                     NULL, dest, 1);
+              if (pkg_hash_add_from_file(conf, dest->status_file_name,
+                                     NULL, dest, 1))
+                      return -1;
          }
      }
 
@@ -529,14 +540,11 @@ static int opkg_conf_parse_file(opkg_conf_t *conf, const char *filename,
               break;
          }
 
-         str_chomp(line);
-
          if (regexec(&comment_re, line, 0, 0, 0) == 0) {
               goto NEXT_LINE;
          }
 
          if (regexec(&valid_line_re, line, regmatch_size, regmatch, 0) == REG_NOMATCH) {
-              str_chomp(line);
               fprintf(stderr, "%s:%d: Ignoring invalid line: `%s'\n",
                       filename, line_num, line);
               goto NEXT_LINE;