Changeset 3826 in MondoRescue

Timestamp:

Mar 4, 2024, 1:23:30 PM (5 months ago)

Author:

Bruno Cornec

Message:

manages postnuke_tarball dynamically

Location:

branches/3.3/mondo/src/common

Files:

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

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

@@ -1591 +1591 @@
     }
 
-    if (bkpinfo->call_before_iso[0] != NULL) {
+    if (bkpinfo->call_before_iso != 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

@@ -719 +719 @@
     if (!flag_set['d'] && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
         if (g_kernel_version >= 2.6) {
-            tmp1 = popup_and_get_string("Device", "Please specify the device",bkpinfo->media_device, MAX_STR_LEN / 4);
+            tmp1 = mr_popup_and_get_string("Device", "Please specify the device",bkpinfo->media_device);
             if (tmp1 == NULL) {
                 retval++;
@@ -826 +826 @@
 
     if ((flag_set['P']) && (! bkpinfo->restore_data)) {
-        strncpy(bkpinfo->postnuke_tarball, flag_val['P'], MAX_STR_LEN);
+        mr_asprintf(bkpinfo->postnuke_tarball, "%s", flag_val['P']);
     }
 

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 = mr_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);
                 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 = 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);
+                    tmp2 = mr_popup_and_get_string("/dev entry?", "What is the /dev entry of your USB Disk/Key, please?", bkpinfo->media_device);
                 } else {
                     if (g_kernel_version < 2.6) {
-                        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);
+                        tmp2 = mr_popup_and_get_string("Device node?", "What is the SCSI node of your CD (re)writer, please?", bkpinfo->media_device);
                     } else {
-                        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);
+                        tmp2 = mr_popup_and_get_string("/dev entry?", "What is the /dev entry of your CD (re)writer, please?", bkpinfo->media_device);
                     }
                 }
@@ -2392 +2392 @@
         }
         if (bkpinfo->media_device == NULL) {
-            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);
+            tmp2 = mr_popup_and_get_string("Device name?", "What is the /dev entry of your tape streamer?", bkpinfo->media_device);
             if (tmp2 == NULL) {
                 log_to_screen("User has chosen not to backup the machine");

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

@@ -1080 +1080 @@
     mr_free(command);
 
-    if (bkpinfo->postnuke_tarball[0]) {
+    if (bkpinfo->postnuke_tarball != NULL) {
         mr_asprintf(command, "cp -f %s %s/post-nuke.tgz", bkpinfo->postnuke_tarball, bkpinfo->tmpdir);
         res = run_program_and_log_output(command, FALSE);

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

@@ -687 +687 @@
     }
     g_current_media_number = 1;
-    bkpinfo->postnuke_tarball[0] = '\0';
     return (res);
 }
@@ -861 +860 @@
     bkpinfo->netfs_user = NULL;
     bkpinfo->netfs_remote_dir = NULL;
-    bkpinfo->postnuke_tarball[0] = '\0';
+    bkpinfo->postnuke_tarball = NULL;
     bkpinfo->subdir = NULL;
     bkpinfo->wipe_media_first = FALSE;

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

@@ -593 +593 @@
   /**
    * A tarball containing a program called "usr/bin/post-nuke" that will be run
-   * after nuking the system. If "", do not use a post-nuke tarball.
-   */
-    char postnuke_tarball[MAX_STR_LEN];
+   * after nuking the system. If NULL, do not use a post-nuke tarball.
+   */
+    char *postnuke_tarball;
 
   /**

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

@@ -430 +430 @@
         mr_free(bkpinfo->image_devs);
         mr_free(bkpinfo->media_device);
+        mr_free(bkpinfo->postnuke_tarball);
         /* Then free the structure */
         paranoid_free(bkpinfo);