Changeset 3193 in MondoRescue for branches/3.1/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Sep 29, 2013, 9:31:34 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Finish with backports from 3.1 for now. Still some work to do, but we will now make that version compile and work again and serve as a base

so the gettext patch can be added

File:

• branches/3.1/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (12 diffs)

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

@@ -212 +212 @@
         mr_strip_spaces(size_str);
 
-        strip_spaces(device_str);
+        mr_strip_spaces(device_str);
         if (b_res == bOK) {
             if (device_str[strlen(device_str) - 1] == '/') {
@@ -480 +480 @@
             mr_free(tmp);
             mr_free(prompt);
-            mr_free(prompt);
             return;
         }
@@ -530 +529 @@
 
     assert(raidrec != NULL);
-
-    if (system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null")) {
-        // FIXME
-    }
+    paranoid_system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
     personalities = last_line_of_file("/tmp/raid-personalities.txt");
     mr_asprintf(prompt, "Please enter the RAID level you want. %s", personalities);
@@ -583 +579 @@
     mr_free(tmp);
     mr_free(prompt);
+
     raidrec->raid_level = out;
 #endif
@@ -607 +604 @@
     int pos = 0;
 
-    /** buffers ***********************************************************/
     assert(mountlist != NULL);
     assert(raidlist != NULL);
@@ -931 +927 @@
                 strcpy(g_strings_of_flist_window[i - 1], tmp1);
                 mr_free(tmp1);
+
                 dummybool = g_is_path_selected[i];
                 g_is_path_selected[i] = g_is_path_selected[i - 1];
@@ -1683 +1680 @@
 
     /** buffers ***********************************************************/
-    char title_of_editraidForm_window[MAX_STR_LEN];
+    char *title_of_editraidForm_window = NULL;
 
     /** newt **************************************************************/
@@ -1713 +1710 @@
     memcpy((void *) &bkp_raidrec, (void *) raidrec,
            sizeof(struct vinum_plex));
-    sprintf(title_of_editraidForm_window, "%s.p%i",
-            raidlist->el[currline].volname, currline2);
+    mr_asprintf(title_of_editraidForm_window, "%s.p%i", raidlist->el[currline].volname, currline2);
     newtPushHelpLine
         ("   Please select a subdisk to edit, or edit this plex's parameters");
     newtOpenWindow(13, 3, 54, 18, title_of_editraidForm_window);
+    mr_free(title_of_editraidForm_window);
+
     for (;;) {
         int i;
@@ -1888 +1886 @@
         strcpy(raidrec->additional_vars.el[lino].value, p);
     }
+    mr_free(header);
+    mr_free(comment);
     mr_free(p);
 }
@@ -1953 +1953 @@
     mr_asprintf(tmp, "%-24s %-24s %-8s  %s", "Device", "Mountpoint", "Format", "Size (MB)");
     headerMsg = newtLabel(2, 1, tmp);
+    mr_free(tmp);
+
     flawsLabelA = newtLabel(2, 13, "         ");
     flawsLabelB = newtLabel(2, 14, "         ");
@@ -2044 +2046 @@
     }
     newtFormDestroy(myForm);
-
-    mr_free(flaws_str_A);
-    mr_free(flaws_str_B);
-    mr_free(flaws_str_C);
-    mr_free(tmp);
-
     newtPopWindow();
     newtPopHelpLine();
@@ -2829 +2825 @@
                         disklist->el[currline].index = atoi(sz_res);
                     }
+
                     redraw_disklist(disklist, keylist, partitionsListbox);
                     mr_free(sz_res);