Changeset 4190

Timestamp:

03/10/08 17:33:00 (5 years ago)

Author:

thomas

Message:

opkg: use a single temporary directory for entire update transaction and remove
it when done.

File:

• trunk/src/target/opkg/libopkg/opkg_cmd.c (modified) (7 diffs)

trunk/src/target/opkg/libopkg/opkg_cmd.c

@@ -185 +185 @@
 static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
+     char *tmp;
      int err;
      int failures;
@@ -213 +214 @@
 
      failures = 0;
+
+
+     tmp = strdup ("/tmp/opkg.XXXXXX");
+
+     if (mkdtemp (tmp) == NULL) {
+         perror ("mkdtemp");
+         failures++;
+     }
+
+
      for (iter = conf->pkg_src_list.head; iter; iter = iter->next) {
           char *url, *list_file_name;
@@ -226 +237 @@
           sprintf_alloc(&list_file_name, "%s/%s", lists_dir, src->name);
           if (src->gzip) {
-              char *tmp;
               char *tmp_file_name;
               FILE *in, *out;
-
-              tmp = strdup ("/tmp/opkg.XXXXXX");
-
-              if (mkdtemp (tmp) == NULL) {
-                  perror ("mkdtemp");
-                  failures++;
-                  continue;
-              }
               
               sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
@@ -253 +255 @@
                         fclose (out);
                    unlink (tmp_file_name);
-                   rmdir (tmp);
-                   free (tmp);
               }
           } else
@@ -275 +275 @@
               sprintf_alloc(&url, "%s/%s", src->value, "Packages.sig");
 
-          /* create temporary dir for it */
-          char *tmp, *tmp_file_name;
-          tmp = strdup ("/tmp/opkg.XXXXXX");
-          if (mkdtemp (tmp) == NULL) {
-                perror ("mkdtemp");
-                failures++;
-                continue;
-          }
+          /* create temporary file for it */
+          char *tmp_file_name;
+
           sprintf_alloc (&tmp_file_name, "%s/%s", tmp, "Packages.sig");
 
@@ -298 +293 @@
           }
           unlink (tmp_file_name);
-          unlink (tmp);
           free (tmp_file_name);
 
@@ -304 +298 @@
           free(list_file_name);
      }
+     rmdir (tmp);
+     free (tmp);
      free(lists_dir);