Changeset 783 in MondoRescue for trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

Timestamp:

Aug 31, 2006, 5:09:20 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Massive rewrite continues for memory management.
• main structure should now have all parameters allocated dynamically
• new lib libmr.a + dir + build process reviewed to support it.
• new include subdir to host external definitions of the new lib
• code now compiles. Still one remaining link issues for mondorestore. This should allow for some tests soon.

(goal is to separate completely reviewed code and functions and provide clean interfaces)

File:

• trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c (modified) (14 diffs)

trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

@@ -537 +537 @@
     char *personalities = NULL;
     char *prompt = NULL;
-    char *sz = NULL;
     int out = 0, res = 0;
 
@@ -544 +543 @@
     system
         ("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
-    personalities = last_line_of_file("/tmp/raid-personalities.txt"));
+    personalities = last_line_of_file("/tmp/raid-personalities.txt");
     asprintf(&prompt, _("Please enter the RAID level you want. %s"),
              personalities);
@@ -616 +615 @@
     int i = 0;
     int pos = 0;
-
-    /** buffers ***********************************************************/
-    char *tmp = NULL;
 
     assert(mountlist != NULL);
@@ -858 +854 @@
             popup_and_OK(tmp);
         } else {
+            paranoid_free(av->el[lino].label);
+            paranoid_free(av->el[lino].value);
             memcpy((void *) &av->el[lino], (void *) &av->el[av->entries--],
                    sizeof(struct raid_var_line));
+            /* BERLIOS: New way of doing should be replaced by line below. Hope it's ok.
+             * Will be when memory for struct is also dynamically allocated
+            av->el[lino] = av->el[av->entries--];
+                   */
         }
     }
@@ -1323 +1325 @@
                                                  device);
                 if (j < 0) {
-                    sprintf(tmp,
+                    asprintf(&tmp,
                             _
                             ("/etc/raidtab does not have an entry for %s; please delete it and add it again"),
                             mountlist->el[currline].device);
                     popup_and_OK(tmp);
+                    paranoid_free(tmp);
                 } else {
                     log_it(_("edit_raidlist_entry - calling"));
@@ -1499 +1502 @@
 
     void *keylist[10];
-    void *curr_choice;
+    void *curr_choice = NULL;
 
     int currline2 = 0;
@@ -1971 +1974 @@
             raidrec->additional_vars.el[lino].label, sz_out);
     if (popup_and_get_string(header, comment, sz_out)) {
-        strcpy(raidrec->additional_vars.el[lino].value, sz_out);
+        paranoid_free(raidrec->additional_vars.el[lino].value);
+        raidrec->additional_vars.el[lino].value = sz_out;
     }
     paranoid_free(header);
     paranoid_free(comment);
-    paranoid_free(sz_out);
 }
 #endif
@@ -2015 +2018 @@
     int currline = 0;
     int finished = FALSE;
+    int res = 0;
 
     /** buffers **********************************************************/
@@ -2025 +2029 @@
     assert(raidlist != NULL);
 
-    asprintf(&flaws_str_A, "xxxxxxxxx");
-    asprintf(&flaws_str_B, "xxxxxxxxx");
-    asprintf(&flaws_str_C, "xxxxxxxxx");
     if (mountlist->entries > ARBITRARY_MAXIMUM) {
         log_to_screen(_("Arbitrary limits suck, man!"));
@@ -2045 +2046 @@
             _("Format"), _("Size (MB)"));
     headerMsg = newtLabel(2, 1, tmp);
-    flawsLabelA = newtLabel(2, 13, flaws_str_A);
-    flawsLabelB = newtLabel(2, 14, flaws_str_B);
-    flawsLabelC = newtLabel(2, 15, flaws_str_C);
+    flawsLabelA = newtLabel(2, 13, "x");
+    flawsLabelB = newtLabel(2, 14, "x");
+    flawsLabelC = newtLabel(2, 15, "x");
     partitionsListbox =
         newtListbox(2, 2, 10, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
@@ -2057 +2058 @@
                           bEdit, bDelete, bReload, bCancel, bOK, NULL);
     while (!finished) {
-        evaluate_mountlist(mountlist, flaws_str_A, flaws_str_B,
+        res = evaluate_mountlist(mountlist, flaws_str_A, flaws_str_B,
                            flaws_str_C);
         newtLabelSetText(flawsLabelA, flaws_str_A);
         newtLabelSetText(flawsLabelB, flaws_str_B);
         newtLabelSetText(flawsLabelC, flaws_str_C);
+
+        paranoid_free(flaws_str_A);
+        paranoid_free(flaws_str_B);
+        paranoid_free(flaws_str_C);
+
         b_res = newtRunForm(myForm);
         /* BERLIOS: This needs to be re-written */
         if (b_res == bOK) {
-            if (!evaluate_mountlist
-                (mountlist, flaws_str_A, flaws_str_B, flaws_str_C)) {
+            if (!res) {
                 finished =
                     ask_me_yes_or_no
@@ -2113 +2118 @@
             }
         }
-        paranoid_free(flaws_str_A);
-        paranoid_free(flaws_str_B);
-        paranoid_free(flaws_str_C);
     }
     newtFormDestroy(myForm);
@@ -2413 +2415 @@
     raidrec = &raidlist->el[pos_in_raidlist];
     initialize_raidrec(raidrec);
-    strcpy(raidrec->OSSWAP(raid_device, volname),
+    asprintf(&raidrec->OSSWAP(raid_device, volname),
            OSSWAP(device, basename(device)));
 #ifndef __FreeBSD__
@@ -2647 +2649 @@
                    (void *) &raidrec->additional_vars.el[i],
                    sizeof(struct raid_var_line));
+            /* BERLIOS : To be changed */
         }
         raidrec->additional_vars.entries--;