Changeset 688 in MondoRescue for trunk/mondo/mondo/mondoarchive/mondo-cli.c

Timestamp:

Jul 17, 2006, 3:44:46 PM (18 years ago)

Author:

bcornec

Message:

Huge memory management patch.
Still not finished but a lot as been done.
What remains is around some functions returning strings, and some structure members.
(Could not finish due to laptop failure !)

File:

• trunk/mondo/mondo/mondoarchive/mondo-cli.c (modified) (9 diffs)

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -14 +14 @@
 #include <pthread.h>
 #endif
-
-//static char cvsid[] = "$Id$";
 
 extern int g_loglevel;
@@ -119 +117 @@
     }
 //    }
-    asprintf(&tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
+    asprintf(&tmp, "rm -Rf %s/mondo.tmp.*", bkpinfo->tmpdir);
     paranoid_system(tmp);
     paranoid_free(tmp);
@@ -127 +125 @@
     paranoid_free(tmp);
 
-    sprintf(bkpinfo->tmpdir + strlen(bkpinfo->tmpdir), "/tmp.mondo.%ld",
+    /* BERLIOS : Useless ???
+    s-printf(bkpinfo->tmpdir + strlen(bkpinfo->tmpdir), "/mondo.tmp.%ld",
             random() % 32767);
-    sprintf(bkpinfo->scratchdir + strlen(bkpinfo->scratchdir),
+    s-printf(bkpinfo->scratchdir + strlen(bkpinfo->scratchdir),
             "/mondo.scratch.%ld", random() % 32767);
+    */
 
     asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
@@ -211 +211 @@
     /*@ ints *** */
     int i = 0;
+    int j = 0;
     int retval = 0;
     int percent = 0;
@@ -216 +217 @@
     /*@ buffers ** */
     char *tmp;
-    char *tmp2;
     char *tmp1;
     char *psz;
@@ -495 +495 @@
         asprintf(&tmp, "mount | grep -x \"%s .*\" | cut -d' ' -f3",
                 bkpinfo->nfs_mount);
-        asprintf(&tmp2, call_program_and_get_last_line_of_output(tmp));
-        bkpinfo->isodir = tmp2;
+        bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp);
         paranoid_free(tmp);
 
@@ -683 +682 @@
             if (popup_and_get_string
                 (_("Device"), _("Please specify the device"),
-                 bkpinfo->media_device, MAX_STR_LEN / 4)) {
+                 bkpinfo->media_device)) {
                 retval++;
                 log_to_screen(_("User opted to cancel."));
@@ -711 +710 @@
         }                       /* not '\0' but '0' */
     }
+    j = (int) random() % 32768;
     if (flag_set['S']) {
-        asprintf(&tmp, "%s/mondo.scratch.%ld", flag_val['S'],
-                random() % 32768);
+        asprintf(&tmp, "%s/mondo.scratch.%ld", flag_val['S'], j);
+        paranoid_free(bkpinfo->scratchdir);
         bkpinfo->scratchdir = tmp;
     }
     if (flag_set['T']) {
-        asprintf(&tmp, "%s/tmp.mondo.%ld", flag_val['T'],
-                random() % 32768);
+        asprintf(&tmp, "%s/mondo.tmp.%ld", flag_val['T'], j);
+        paranoid_free(bkpinfo->tmpdir);
         bkpinfo->tmpdir = tmp;
         asprintf(&tmp, "touch %s/.foo.dat", flag_val['T']);
@@ -766 +766 @@
             (BOOT_LOADER_CHARS,
              (bkpinfo->boot_loader = flag_val['l'][0]))) {
-            log_msg(1, "%c? WTF is %c? I need G, L, E or R.",
+            log_msg(1, "%c? What is %c? I need G, L, E or R.",
                     bkpinfo->boot_loader, bkpinfo->boot_loader);
             fatal_error