Changeset 3823 in MondoRescue for branches/3.3/mondo/src/common

Timestamp:

Mar 3, 2024, 2:57:40 AM (4 months ago)

Author:

Bruno Cornec

Message:

manages call_before_iso dynamically

Location:

branches/3.3/mondo/src/common

Files:

• libmondo-archive.c (modified) (1 diff)
• libmondo-cli.c (modified) (1 diff)
• libmondo-devices.c (modified) (3 diffs)
• libmondo-tools.c (modified) (2 diffs)
• mondostructures.h (modified) (1 diff)

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

@@ -1591 +1591 @@
     }
 
-    if (bkpinfo->call_before_iso[0] != '\0') {
+    if (bkpinfo->call_before_iso[0] != NULL) {
         mr_asprintf(message_to_screen, "Running pre-ISO call for CD#%d", g_current_media_number);
         res = eval_call_to_make_ISO(bkpinfo->call_before_iso, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);

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

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

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

@@ -2308 +2308 @@
                 log_msg(1, "bkpinfo->media_device = %s", bkpinfo->media_device);
                 mr_asprintf(comment, "Please specify your %s drive's /dev entry", mds);
-                tmp2 = popup_and_get_string("Device?", comment, bkpinfo->media_device,(MAX_STR_LEN / 4)-1);
+                tmp2 = mr_popup_and_get_string("Device?", comment, bkpinfo->media_device,(MAX_STR_LEN / 4)-1);
                 if (!tmp2) {
                     log_to_screen("User has chosen not to backup the machine");
@@ -2335 +2335 @@
             if (bkpinfo->media_device != NULL) {
                 if (bkpinfo->backup_media_type == usb) {
-                    tmp2 = popup_and_get_string("/dev entry?", "What is the /dev entry of your USB Disk/Key, please?", bkpinfo->media_device, (MAX_STR_LEN / 4)-1);
+                    tmp2 = mr_popup_and_get_string("/dev entry?", "What is the /dev entry of your USB Disk/Key, please?", bkpinfo->media_device, (MAX_STR_LEN / 4)-1);
                 } else {
                     if (g_kernel_version < 2.6) {
-                        tmp2 = popup_and_get_string("Device node?", "What is the SCSI node of your CD (re)writer, please?", bkpinfo->media_device,(MAX_STR_LEN / 4)-1);
+                        tmp2 = mr_popup_and_get_string("Device node?", "What is the SCSI node of your CD (re)writer, please?", bkpinfo->media_device,(MAX_STR_LEN / 4)-1);
                     } else {
-                        tmp2 = popup_and_get_string("/dev entry?", "What is the /dev entry of your CD (re)writer, please?", bkpinfo->media_device,(MAX_STR_LEN / 4)-1);
+                        tmp2 = mr_popup_and_get_string("/dev entry?", "What is the /dev entry of your CD (re)writer, please?", bkpinfo->media_device,(MAX_STR_LEN / 4)-1);
                     }
                 }
@@ -2392 +2392 @@
         }
         if (bkpinfo->media_device == NULL) {
-            tmp2 = popup_and_get_string("Device name?", "What is the /dev entry of your tape streamer?", bkpinfo->media_device,(MAX_STR_LEN / 4)-1);
+            tmp2 = mr_popup_and_get_string("Device name?", "What is the /dev entry of your tape streamer?", bkpinfo->media_device,(MAX_STR_LEN / 4)-1);
             if (tmp2 == NULL) {
                 log_to_screen("User has chosen not to backup the machine");

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

@@ -537 +537 @@
 
         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);
+            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);
-                sprintf(bkpinfo->call_before_iso, "( %s -o %s/"MONDO_TMPISOS" . 2>> _ERR_ ; %s )", mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
+                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);
             }
@@ -851 +852 @@
     bkpinfo->exclude_devs = NULL;
     bkpinfo->restore_path[0] = '\0';
-    bkpinfo->call_before_iso[0] = '\0';
+    bkpinfo->call_before_iso = NULL;
     bkpinfo->call_make_iso[0] = '\0';
     bkpinfo->call_burn_iso[0] = '\0';

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

@@ -540 +540 @@
    * A command to call BEFORE making an ISO image.
    */
-    char call_before_iso[MAX_STR_LEN];
+    char *call_before_iso;
 
   /**