Changeset 2328 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-tools.c

Timestamp:

Aug 18, 2009, 3:20:42 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3339@localhost: bruno | 2009-08-11 23:56:01 +0200
bkpinfo->kernel_path, bkpinfo->call_before_iso, bkpinfo->call_make_iso, bkpinfo->call_burn_iso, bkpinfo->call_after_iso and bkpinfo->postnuke_tarball are now dynamically allocated

File:

• branches/2.2.10/mondo/src/common/libmondo-tools.c (modified) (7 diffs)

branches/2.2.10/mondo/src/common/libmondo-tools.c

@@ -418 +418 @@
     char *tmp = NULL;
     char *p = NULL;
-    char call_before_iso_user[MAX_STR_LEN] = "\0";
+    char call_before_iso_user = NULL;
     char *iso_dev = NULL;
     char *iso_mnt = NULL;
@@ -529 +529 @@
                 return(1);
             }
-            sprintf(bkpinfo->call_make_iso,
-                    "%s %s -Z %s . 2>> _ERR_",
-                    mondo_mkisofs_sz,
-                    "", bkpinfo->media_device);
+            mr_free(bkpinfo->call_make_iso);
+            mr_asprintf(bkpinfo->call_make_iso, "%s %s -Z %s . 2>> _ERR_", mondo_mkisofs_sz, "", bkpinfo->media_device);
             paranoid_free(mondo_mkisofs_sz);
         }
@@ -544 +542 @@
             mr_free(command);
         }
-        log_msg(2, "call_make_iso (DVD res) is ... %s",
-                bkpinfo->call_make_iso);
+        log_msg(2, "call_make_iso (DVD res) is ... %s", bkpinfo->call_make_iso);
     }                           // end of DVD code
 
@@ -585 +582 @@
             mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
         }
+
+        mr_free(bkpinfo->call_make_iso);
         if (bkpinfo->manual_cd_tray) {
-            if (bkpinfo->call_before_iso[0] == '\0') {
-            sprintf(bkpinfo->call_before_iso,
-                        "%s -o %s/"MONDO_TMPISOS" . 2>> _ERR_",
-                        mondo_mkisofs_sz, bkpinfo->tmpdir);
-                } else {
-                strncpy(call_before_iso_user, bkpinfo->call_before_iso, MAX_STR_LEN);
-                sprintf (bkpinfo->call_before_iso,
-                                    "( %s -o %s/"MONDO_TMPISOS" . 2>> _ERR_ ; %s )",
-                        mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
+            if (bkpinfo->call_before_iso == NULL) {
+                mr_asprintf(bkpinfo->call_before_iso, "%s -o %s/"MONDO_TMPISOS" . 2>> _ERR_", mondo_mkisofs_sz, bkpinfo->tmpdir);
+            } else {
+                mr_asprintf(call_before_iso_user, "%s", bkpinfo->call_before_iso);
+                mr_free(bkpinfo->call_before_iso);
+                mr_asprintf(bkpinfo->call_before_iso, "( %s -o %s/"MONDO_TMPISOS" . 2>> _ERR_ ; %s )", mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
+                mr_free(call_before_iso_user);
             }
             log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
@@ -600 +597 @@
                 return(1);
             }
-            sprintf(bkpinfo->call_make_iso,
-                    "%s %s -v %s fs=4m dev=%s speed=%d %s/"MONDO_TMPISOS,
-                    cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject",
-                    extra_cdrom_params, bkpinfo->media_device,
-                    bkpinfo->cdrw_speed, bkpinfo->tmpdir);
+            mr_asprintf(bkpinfo->call_make_iso, "%s %s -v %s fs=4m dev=%s speed=%d %s/"MONDO_TMPISOS, cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject", extra_cdrom_params, bkpinfo->media_device, bkpinfo->cdrw_speed, bkpinfo->tmpdir);
         } else {
-            sprintf(bkpinfo->call_make_iso,
-                    "%s . 2>> _ERR_ | %s %s %s fs=4m dev=%s speed=%d -",
-                    mondo_mkisofs_sz, cdr_exe,
-                    (bkpinfo->please_dont_eject) ? " " : "-eject",
-                    extra_cdrom_params, bkpinfo->media_device,
-                    bkpinfo->cdrw_speed);
+            mr_asprintf(bkpinfo->call_make_iso, "%s . 2>> _ERR_ | %s %s %s fs=4m dev=%s speed=%d -", mondo_mkisofs_sz, cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject", extra_cdrom_params, bkpinfo->media_device, bkpinfo->cdrw_speed);
         }
         paranoid_free(mondo_mkisofs_sz);
@@ -810 +798 @@
     mr_free(bkpinfo->exclude_paths);
     mr_free(bkpinfo->restore_path);
+    mr_free(bkpinfo->call_before_iso);
+    mr_free(bkpinfo->call_make_iso);
+    mr_free(bkpinfo->call_burn_iso);
+    mr_free(bkpinfo->call_after_iso);
+    mr_free(bkpinfo->kernel_path);
     mr_free(bkpinfo->nfs_mount);
     mr_free(bkpinfo->nfs_remote_dir);
     mr_free(bkpinfo->nfs_user);
+    mr_free(bkpinfo->postnuke_tarball);
 
     /* Then free the structure */
@@ -860 +854 @@
     bkpinfo->exclude_paths = NULL;
     bkpinfo->restore_path = NULL;
-    bkpinfo->call_before_iso[0] = '\0';
-    bkpinfo->call_make_iso[0] = '\0';
-    bkpinfo->call_burn_iso[0] = '\0';
-    bkpinfo->call_after_iso[0] = '\0';
-    bkpinfo->kernel_path[0] = '\0';
+    bkpinfo->call_before_iso = NULL;
+    bkpinfo->call_make_iso = NULL;
+    bkpinfo->call_burn_iso = NULL;
+    bkpinfo->call_after_iso = NULL;
+    bkpinfo->kernel_path = NULL;
     bkpinfo->nfs_mount = NULL;
     bkpinfo->nfs_remote_dir = NULL;
     bkpinfo->nfs_user = NULL;
-    bkpinfo->postnuke_tarball[0] = '\0';
+    bkpinfo->postnuke_tarball = NULL;
     bkpinfo->wipe_media_first = FALSE;
     bkpinfo->differential = 0;