Changeset 3827 in MondoRescue for branches/3.3/mondo/src

Timestamp:

Mar 4, 2024, 1:33:29 PM (4 months ago)

Author:

Bruno Cornec

Message:

manages call_make|burn|after_iso dynamically

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-archive.c (modified) (3 diffs)
• common/libmondo-cli.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (3 diffs)
• common/mondostructures.h (modified) (1 diff)
• common/newt-specific.c (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (1 diff)

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

@@ -1605 +1605 @@
     }
 
-    if (bkpinfo->call_make_iso[0] != '\0') {
+    if (bkpinfo->call_make_iso != NULL) {
         log_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
@@ -1779 +1779 @@
     }
 
-    if (bkpinfo->call_burn_iso[0] != '\0') {
+    if (bkpinfo->call_burn_iso != NULL) {
         log_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
@@ -1797 +1797 @@
     }
 
-    if (bkpinfo->call_after_iso[0] != '\0') {
+    if (bkpinfo->call_after_iso != NULL) {
         mds = media_descriptor_string(bkpinfo->backup_media_type);
         mr_asprintf(message_to_screen, "Running post-ISO call (%s #%d)", mds, g_current_media_number);

branches/3.3/mondo/src/common/libmondo-cli.c

@@ -792 +792 @@
 
     if ((flag_set['A']) && (! bkpinfo->restore_data)) {
-        strncpy(bkpinfo->call_after_iso, flag_val['A'], MAX_STR_LEN);
+        mr_asprintf(bkpinfo->call_after_iso, "%s", flag_val['A']);
     }
 

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

@@ -470 +470 @@
             // -m isn't supported by growisofs, BTW...
         } else {
-            sprintf(bkpinfo->call_make_iso, "%s %s -Z %s . 2>> _ERR_", mondo_mkisofs_sz, "", bkpinfo->media_device);
+            mr_asprintf(bkpinfo->call_make_iso, "%s %s -Z %s . 2>> _ERR_", mondo_mkisofs_sz, "", bkpinfo->media_device);
         }
         mr_free(mondo_mkisofs_sz);
@@ -546 +546 @@
             }
             log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
-            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);
         }
         mr_free(cdr_exe);
@@ -852 +852 @@
     bkpinfo->restore_path[0] = '\0';
     bkpinfo->call_before_iso = NULL;
-    bkpinfo->call_make_iso[0] = '\0';
-    bkpinfo->call_burn_iso[0] = '\0';
-    bkpinfo->call_after_iso[0] = '\0';
+    bkpinfo->call_make_iso = NULL;
+    bkpinfo->call_burn_iso = NULL;
+    bkpinfo->call_after_iso = NULL;
     bkpinfo->kernel_path[0] = '\0';
     bkpinfo->netfs_mount = NULL;

branches/3.3/mondo/src/common/mondostructures.h

@@ -545 +545 @@
    * A command to call to make an ISO image.
    */
-    char call_make_iso[MAX_STR_LEN];
+    char *call_make_iso;
 
   /**
    * A command to call to burn the ISO image.
    */
-    char call_burn_iso[MAX_STR_LEN];
+    char *call_burn_iso;
 
   /**
    * A command to call AFTER making an ISO image.
    */
-    char call_after_iso[MAX_STR_LEN];
+    char *call_after_iso;
 
   /**

branches/3.3/mondo/src/common/newt-specific.c

@@ -431 +431 @@
         mr_free(bkpinfo->media_device);
         mr_free(bkpinfo->postnuke_tarball);
+        mr_free(bkpinfo->call_burn_iso);
+        mr_free(bkpinfo->call_make_iso);
+        mr_free(bkpinfo->call_after_iso);
+        mr_free(bkpinfo->call_before_iso);
         /* Then free the structure */
         paranoid_free(bkpinfo);

branches/3.3/mondo/src/mondoarchive/mondoarchive.c

@@ -188 +188 @@
         exit(-1);
     }
-    /*  Now on we can use finish to exit as bkpingo has been initialized */
+    /*  Now on we can use finish to exit as bkpinfo has been initialized */
     log_msg(9, "reset_bkpinfo");
     reset_bkpinfo();