Changeset 1139 in MondoRescue for branches/stable/mondo/src/common

Timestamp:

Feb 11, 2007, 7:04:12 PM (18 years ago)

Author:

Bruno Cornec

Message:

memory tests improvements
useless code removed from libmondo-fork.c
more merges for libmondo-archive.c

Location:

branches/stable/mondo/src/common

Files:

• libmondo-archive.c (modified) (7 diffs)
• libmondo-fork.c (modified) (1 diff)

branches/stable/mondo/src/common/libmondo-archive.c

@@ -1876 +1876 @@
                  g_current_media_number);
         mr_msg(1, message_to_screen);
-        sprintf(result_sz, "Call to mkisofs to make ISO (%s #%d) ",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
+        mr_asprintf(&result_sz, "Call to mkisofs to make ISO (%s #%d) ",
+                 bkpinfo->backup_media_string,
+                 g_current_media_number);
         if (bkpinfo->nonbootable_backup) {
             mr_msg(1, "Making nonbootable backup");
-            res =
-                eval_call_to_make_ISO(bkpinfo,
-                                      "mkisofs -o '_ISO_' -r -p MondoRescue -publisher www.mondorescue.org -A MondoRescue_GPL -V _CD#_ .",
-                                      destfile, g_current_media_number,
-                                      MONDO_LOGFILE, message_to_screen);
+            res = eval_call_to_make_ISO(bkpinfo,
+                                        "mkisofs -o '_ISO_' -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
+                                        destfile, g_current_media_number,
+                                        MONDO_LOGFILE, message_to_screen);
         } else {
             mr_msg(1, "Making bootable backup");
@@ -1940 +1939 @@
         }
         retval += res;
+        mr_free(result_sz);
     }
 
@@ -1948 +1948 @@
                     "Warning - %s mounted. I'm unmounting it before I burn to it.",
                     bkpinfo->media_device);
-            sprintf(tmp, "umount %s", bkpinfo->media_device);
+            mr_asprintf(&tmp, "umount %s", bkpinfo->media_device);
             run_program_and_log_output(tmp, FALSE);
+            mr_free(tmp);
         }
     }
@@ -1955 +1956 @@
     if (bkpinfo->call_burn_iso[0] != '\0') {
         mr_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso);
-        sprintf(message_to_screen, "Burning %s #%d",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
+        mr_asprintf(&message_to_screen, "Burning %s #%d",
+                 bkpinfo->backup_media_string,
+                 g_current_media_number);
         pause_and_ask_for_cdr(2, &cd_is_mountable);
-        res =
-            eval_call_to_make_ISO(bkpinfo, bkpinfo->call_burn_iso,
-                                  destfile, g_current_media_number,
-                                  MONDO_LOGFILE, message_to_screen);
+        res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_burn_iso,
+                                    destfile, g_current_media_number,
+                                    MONDO_LOGFILE, message_to_screen);
         if (res) {
-            strcat(message_to_screen, "...failed");
+            log_to_screen("%s...failed", message_to_screen);
         } else {
-            strcat(message_to_screen, "...OK");
-        }
-        log_to_screen(message_to_screen);
+            log_to_screen("%s...OK", message_to_screen);
+        }
+        mr_free(message_to_screen);
         retval += res;
     }
 
-    if (bkpinfo->call_after_iso[0] != '\0') {
-        sprintf(message_to_screen, "Running post-ISO call (%s #%d)",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
-        res =
-            eval_call_to_make_ISO(bkpinfo, bkpinfo->call_after_iso,
-                                  destfile, g_current_media_number,
-                                  MONDO_LOGFILE, message_to_screen);
+    if (bkpinfo->call_after_iso != NULL) {
+        mr_asprintf(&message_to_screen, "Running post-ISO call (%s #%d)",
+                 bkpinfo->backup_media_string,
+                 g_current_media_number);
+        res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_after_iso,
+                                    destfile, g_current_media_number,
+                                    MONDO_LOGFILE, message_to_screen);
         if (res) {
-            strcat(message_to_screen, "...failed");
+            log_to_screen("%s...failed", message_to_screen);
         } else {
-            strcat(message_to_screen, "...OK");
-        }
-        log_to_screen(message_to_screen);
+            log_to_screen("%s...OK", message_to_screen);
+        }
+        mr_free(message_to_screen);
         retval += res;
     }
@@ -1994 +1993 @@
     }
     mr_free(old_pwd);
-    mr_free(result_sz);
-    mr_free(message_to_screen);
-    mr_free(sz_blank_disk);
     return (retval);
 }
@@ -2048 +2044 @@
     /*@ buffers ******************************************** */
     char *tmp;
-    char *bigfile_fname;
+    char *bigfile_fname = NULL;
     char *sz_devfile;
     char *ntfsprog_fifo = NULL;
@@ -2059 +2055 @@
     int retval = 0;
     int res = 0;
+    size_t n = 0;
     pid_t pid;
     FILE *ftmp = NULL;

branches/stable/mondo/src/common/libmondo-fork.c

@@ -217 +217 @@
     }                           /* single '=' is intentional */
 
-
-    len = (int) strlen(program);
-    malloc_string(tmp);
-    for (i = 0; i < 35 - len / 2; i++) {
-        tmp[i] = '-';
-    }
-    tmp[i] = '\0';
-    strcat(tmp, " ");
-    strcat(tmp, program);
-    strcat(tmp, " ");
-    for (i = 0; i < 35 - len / 2; i++) {
-        strcat(tmp, "-");
-    }
-    mr_free(tmp);
-
     res = system(callstr);
     if (((res == 0) && log_if_success) || ((res != 0) && log_if_failure)) {