Changeset 3838 in MondoRescue for branches

Timestamp:

Mar 5, 2024, 3:02:02 AM (4 months ago)

Author:

Bruno Cornec

Message:

Fix compiler errors

Location:

branches/3.3/mondo/src/common

Files:

• libmondo-cli.c (modified) (2 diffs)
• libmondo-devices.c (modified) (4 diffs)
• mondostructures.h (modified) (2 diffs)

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

@@ -46 +46 @@
 extern char *resolve_softlinks_to_get_to_actual_device_file(char *);
 extern char *mr_popup_and_get_string(char *, char *, char *);
+extern char *call_program_and_get_last_line_of_output(const char *);
 
 extern t_boot mr_boot_type(void);
@@ -717 +718 @@
     if (!flag_set['d'] && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
         if (g_kernel_version >= 2.6) {
-            tmp1 = mr_popup_and_get_string("Device", "Please specify the device",bkpinfo->media_device);
+            tmp1 = mr_popup_and_get_string("Device", "Please specify the device", bkpinfo->media_device);
             if (tmp1 == NULL) {
                 retval++;

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

@@ -54 +54 @@
 extern void setup_scratchdir(char *path);
 extern char *mr_popup_and_get_string(char *title, char *b, char *input);
+extern char *call_program_and_get_last_line_of_output(const char *);
 
 static char g_cdrw_drive_is_here[MAX_STR_LEN / 4] = "";
@@ -1354 +1355 @@
         log_msg(2, "Mounting for Network thingy");
         log_msg(2, "isodir = %s", bkpinfo->isodir);
-        if ((bkpinfo->isodir == NULL) || !strcmp(bkpinfo->isodir, "/"))) && am_I_in_disaster_recovery_mode()) {
+        if (((bkpinfo->isodir == NULL) || !strcmp(bkpinfo->isodir, "/")) && am_I_in_disaster_recovery_mode()) {
             mr_asprintf(bkpinfo->isodir, "%s", "/tmp/isodir");
             log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
@@ -2623 +2624 @@
         bkpinfo->netfs_remote_dir = mr_strip_spaces(tmp1);
 
-        tmp = popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix);
+        tmp = mr_popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix);
         if (tmp == NULL) {
             log_to_screen("User has chosen not to backup the machine");
@@ -2664 +2665 @@
             }
         }
-        tmp = popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix);
+        tmp = mr_popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix);
         if (tmp == NULL) {
             log_to_screen("User has chosen not to backup the machine");

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

@@ -467 +467 @@
    * If backup_media_type is anything else, this is ignored.
    */
-    char isodir[MAX_STR_LEN / 4];
+    char *isodir;
 
 /**
@@ -474 +474 @@
    * If backup_media_type is anything else, this is ignored.
    */
-    char prefix[MAX_STR_LEN / 4];
+    char *prefix;
 
   /**