Changeset 3892 in MondoRescue for branches/3.3/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Mar 12, 2024, 3:10:24 AM (3 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/mondorestore/mondo-rstr-newt.c (modified) (7 diffs)

branches/3.3/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -615 +615 @@
  * @ingroup restoreGuiMountlist
  */
-void
-choose_raid_level(struct OSSWAP (raid_device_record, vinum_plex) * raidrec)
-{
+void choose_raid_level(struct OSSWAP (raid_device_record, vinum_plex) * raidrec) {
 
 #ifdef __FreeBSD__
 
     /** int ***************************************************************/
-    int res = 0;
     int out = 0;
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *tmp1 = NULL;
     char *prompt = NULL;
-    char sz[MAX_STR_LEN];
+    char *sz = NULL;
 
     mr_asprintf(prompt, "Please enter the RAID level you want. (concat, striped, raid5)");
     if (raidrec->raidlevel == -1) {
-        strcpy(tmp, "concat");
+        mr_asprintf(tmp, "%s", "concat");
     } else if (raidrec->raidlevel == 0) {
-        strcpy(tmp, "striped");
+        mr_asprintf(tmp, "%s", "striped");
     } else {
-        sprintf(tmp, "raid%i", raidrec->raidlevel);
+        mr_asprintf(tmp, "raid%i", raidrec->raidlevel);
     }
     for (out = 999; out == 999;) {
-        res = popup_and_get_string("Specify RAID level", prompt, tmp, 10);
-        if (!res) {
+        tmp1 = mr_popup_and_get_string("Specify RAID level", prompt, tmp);
+        if (tmp1 == NULL) {
             mr_free(prompt);
+            mr_free(tmp);
             return;
         }
-        strip_spaces(tmp);
+        mr_free(tmp);
+        tmp = mr_strip_spaces(tmp1);
+        log_it(tmp);
+
         if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
-            strcpy(sz, tmp);
-            strncpy(tmp, sz + 1, strlen(sz) - 2);
+            sz = tmp;
+            // safe as shorter
+            mr_strncpy(tmp, sz + 1, strlen(sz) - 2);
             tmp[strlen(sz) - 2] = '\0';
         }
@@ -657 +660 @@
             out = 5;
         }
-        log_it(tmp);
+        mr_free(tmp);
+
         if (is_this_raid_personality_registered(out)) {
             log_it("Groovy. You've picked a RAID personality which is registered.");
@@ -664 +668 @@
             {
                 out = 999;
+                if (raidrec->raid_level == -1) {
+                    mr_asprintf(tmp, "%s", "linear");
+                } else {
+                    mr_asprintf(tmp, "%d", raidrec->raid_level);
+                }
             }
         }
     }
     mr_free(prompt);
+    mr_free(tmp);
 
     raidrec->raidlevel = out;
 #else
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *tmp1 = NULL;
     char *personalities = NULL;
     char *prompt = NULL;
-    char sz[MAX_STR_LEN];
+    char *sz;
     int out = 0;
-    int res = 0;
 
 
     assert(raidrec != NULL);
-    paranoid_system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
+    paranoid_system("grep Pers " MDSTAT_FILE " > /tmp/raid-personalities.txt 2> /dev/null");
     mr_asprintf(personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt"));
     mr_asprintf(prompt, "Please enter the RAID level you want. %s", personalities);
@@ -687 +697 @@
 
     if (raidrec->raid_level == -1) {
-        strcpy(tmp, "linear");
+        mr_asprintf(tmp, "%s", "linear");
     } else {
-        sprintf(tmp, "%d", raidrec->raid_level);
+        mr_asprintf(tmp, "%d", raidrec->raid_level);
     }
     for (out = 999;
          out != -1 && out != 0 && out != 1 && out != 4 && out != 5
          && out != 10;) {
-        res = popup_and_get_string("Specify RAID level", prompt, tmp, 10);
-        if (!res) {
+        tmp1 = mr_popup_and_get_string("Specify RAID level", prompt, tmp);
+        if (tmp1 == NULL) {
+            mr_free(tmp);
+            mr_free(prompt);
             return;
         }
-        strip_spaces(tmp);
+        mr_free(tmp);
+        tmp = mr_strip_spaces(tmp1);
+        log_it(tmp);
+
         if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
-            strcpy(sz, tmp);
-            strncpy(tmp, sz + 1, strlen(sz) - 2);
+            sz = tmp;
+            // safe as shorter
+            mr_strncpy(tmp, sz + 1, strlen(sz) - 2);
             tmp[strlen(sz) - 2] = '\0';
         }
@@ -711 +727 @@
             out = atoi(tmp);
         }
-        log_it(tmp);
+        mr_free(tmp);
+
         if (is_this_raid_personality_registered(out)) {
             log_it("Groovy. You've picked a RAID personality which is registered.");
@@ -717 +734 @@
             if (ask_me_yes_or_no("You have chosen a RAID personality which is not registered with the kernel. Make another selection?")) {
                 out = 999;
+                mr_free(tmp);
+                if (raidrec->raid_level == -1) {
+                    mr_asprintf(tmp, "%s", "linear");
+                } else {
+                    mr_asprintf(tmp, "%d", raidrec->raid_level);
+                }
             }
         }
     }
     mr_free(prompt);
+    mr_free(tmp);
 
     raidrec->raid_level = out;
@@ -2483 +2507 @@
 
 
-#if __FreeBSD__
+#ifdef __FreeBSD__
 /**
  * Add a subdisk to @p raidrec.