Changeset 3892 in MondoRescue for branches/3.3/mondo/src/common/libmondo-devices.c

Timestamp:

Mar 12, 2024, 3:10:24 AM (2 months ago)

Author:

Bruno Cornec

Message:

More compiler fixes

• Fix unused vars
• Fix FreeBSD #if alone
• Use MDSTAT_FILE everywhere
• Fix missing break
• Fix some strncpy. mr_strncpy used when safe
• Fix wrong g_isoform_header_str proto !
• find-cd & find-dvd => find-optical

File:

• branches/3.3/mondo/src/common/libmondo-devices.c (modified) (6 diffs)

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

@@ -443 +443 @@
                 mr_free(mount_list);
 
-                mr_asprintf(command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
+                mr_asprintf(command, "%s", "cat " MDSTAT_FILE " |grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
                 log_msg (5, "Running: %s", command);
                 mount_list = call_program_and_get_last_line_of_output(command);
@@ -499 +499 @@
 
         /* Get the Software raid device list */
-        mr_asprintf(command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
+        mr_asprintf(command, "%s", "cat " MDSTAT_FILE " | grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
         log_msg (5, "  Running: %s", command);
         mount_list = call_program_and_get_last_line_of_output(command);
@@ -788 +788 @@
 bool does_nonMS_partition_exist(void)
 {
-#if __FreeBSD__
+#ifdef __FreeBSD__
     return
         !system("for drive in /dev/ad? /dev/da?; do fdisk $drive | grep -q FreeBSD && exit 0; done; false");
@@ -2136 +2136 @@
 
     case udev:
-        if (!ask_me_yes_or_no
-            ("This option is for advanced users only. Are you sure?")) {
+        if (!ask_me_yes_or_no("This option is for advanced users only. Are you sure?")) {
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
         }
+        break;
+
     case tape:
 
@@ -2483 +2484 @@
 // NTFS 
         tmp = call_program_and_get_last_line_of_output("mr-parted2fdisk -l 2>/dev/null | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'");
-        strncpy(tmp1, tmp,(MAX_STR_LEN / 4)-1);
+        if (strlen(tmp) > 2) {
+            tmp1 = mr_popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp);
+            if (tmp1 == NULL) {
+                log_to_screen("User has chosen not to backup the machine");
+                mr_free(tmp);
+                mr_free(tmp1);
+                finish(1);
+            }
+            mr_free(bkpinfo->image_devs);
+            bkpinfo->image_devs = tmp1;
+        }
         mr_free(tmp);
-        if (strlen(tmp1) > 2) {
-            if (!popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp1,(MAX_STR_LEN / 4)-1)) {
-                log_to_screen("User has chosen not to backup the machine");
-                finish(1);
-            }
-            mr_asprintf(bkpinfo->image_devs, "%s", tmp1);
-        }
 
         if (bkpinfo->exclude_paths != NULL ) {
@@ -2572 +2576 @@
         mr_free(compression_type);
 
+#ifdef __FreeBSD__
 #if __FreeBSD__ == 5
         mr_asprintf(bkpinfo->kernel_path, "%s", "/boot/kernel/kernel");
 #elif __FreeBSD__ == 4
         mr_asprintf(bkpinfo->kernel_path, "%s", "/kernel");
+#endif
 #elif linux
         if (figure_out_kernel_path_interactively_if_necessary(bkpinfo->kernel_path)) {