Changeset 1187 in MondoRescue for branches/stable/mondo/src/mondoarchive/mondo-cli.c

Timestamp:

Feb 20, 2007, 3:03:33 AM (17 years ago)

Author:

Bruno Cornec

Message:

Merge trunk memory management for mondoarchive
Rename main.c to mondoarchive.c

File:

• branches/stable/mondo/src/mondoarchive/mondo-cli.c (modified) (6 diffs)

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -10 +10 @@
 /** @def BOOT_LOADER_CHARS The characters allowed for boot loader on this platform. */
 
+#include "my-stuff.h"
+#include "mondostructures.h"
+#include "mondo-cli-EXT.h"
+#include "libmondo.h"
 #include <pthread.h>
-#include "my-stuff.h"
-#include "../common/mondostructures.h"
-#include "mondo-cli-EXT.h"
-#include "../common/libmondo.h"
 #include "mr_mem.h"
 #include "mr_msg.h"
@@ -50 +50 @@
  */
 bool g_ISO_restore_mode = FALSE;
-
 
 extern double g_kernel_version;
@@ -80 +79 @@
     int res = 0;
     int retval = 0;
-    int i = 0, j;
+    int i = 0, j = 0;
 
     /*@ buffers *************** */
-    char *tmp;
+    char *tmp = NULL;
     char flag_val[128][MAX_STR_LEN];
     bool flag_set[128];
 
-    malloc_string(tmp);
     sensibly_set_tmpdir_and_scratchdir(bkpinfo);
+
     for (i = 0; i < 128; i++) {
         flag_val[i][0] = '\0';
         flag_set[i] = FALSE;
     }
-    //  strcpy (bkpinfo->tmpdir, "/root/images/mondo");
-    //  strcpy (bkpinfo->scratchdir, "/home");
     for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
         bkpinfo->media_size[j] = 650;
@@ -113 +110 @@
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            sprintf(tmp, "-%c %s", i, flag_val[i]);
-            mr_msg(3, tmp);
+            mr_msg(3, "-%c %s", i, flag_val[i]);
         }
     }
 //    }
-    sprintf(tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
     paranoid_system(tmp);
-    sprintf(tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
     paranoid_system(tmp);
+    mr_free(tmp);
+
     sprintf(bkpinfo->tmpdir + strlen(bkpinfo->tmpdir), "/tmp.mondo.%ld",
             random() % 32767);
     sprintf(bkpinfo->scratchdir + strlen(bkpinfo->scratchdir),
             "/mondo.scratch.%ld", random() % 32767);
-    sprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
+
+    mr_asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
     paranoid_system(tmp);
-    sprintf(tmp, "mkdir -p %s", bkpinfo->scratchdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "mkdir -p %s", bkpinfo->scratchdir);
     paranoid_system(tmp);
     mr_free(tmp);
     return (retval);
 }
-
-
 
 
@@ -165 +166 @@
         bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(p);
     }
-//      bkpinfo->media_size[0] = bkpinfo->media_size[MAX_NOOF_MEDIA];
     for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
         if (bkpinfo->media_size[j] <= 0) {
@@ -174 +174 @@
     return (0);
 }
-