Changeset 1207 in MondoRescue

Timestamp:

Feb 26, 2007, 6:20:46 AM (17 years ago)

Author:

Bruno Cornec

Message:

trunk in parity with stable

File:

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

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

@@ -1 @@
-/***************************************************************************
+/*
  * $Id$
 */
+#include "mr_mem.h"
+#include "mr_msg.h"
+#include "mr_str.h"
+
 
 /**
@@ -15 +19 @@
 
 #include "mondo-rstr-newt.h"
-#include "mr_mem.h"
+
+//static char cvsid[] = "$Id$";
 
 /**
@@ -201 +206 @@
         mr_free(device_str);
         mr_asprintf(&device_str, device_here);
-        strip_spaces(device_str);
+        mr_strip_spaces(device_str);
 
         mr_free(format_str);
         mr_asprintf(&format_str, format_here);
-        strip_spaces(format_str);
+        mr_strip_spaces(format_str);
 
         mr_free(mountpoint_str);
         mr_asprintf(&mountpoint_str, mountpoint_here);
-        strip_spaces(mountpoint_str);
+        mr_strip_spaces(mountpoint_str);
 
         mr_free(size_str);
         mr_asprintf(&size_str, size_here);
-        strip_spaces(size_str);
+        mr_strip_spaces(size_str);
 
         if (b_res == bOK) {
@@ -232 +237 @@
     newtPopWindow();
     if (b_res == bCancel) {
+        mr_free(device_str);
+        mr_free(format_str);
+        mr_free(mountpoint_str);
+        mr_free(size_str);
         return;
     }
@@ -237 +246 @@
     for (i = strlen(drive_to_add); isdigit(drive_to_add[i - 1]); i--);
     num_to_add = atoi(drive_to_add + i);
-    drive_to_add[i] = '\0';
     mr_free(drive_to_add);
 
@@ -282 +290 @@
         ("Add variable", _("Enter the name of the variable to add"),
          sz_out)) {
+        mr_strip_spaces(sz_out);
         items = raidrec->additional_vars.entries;
         for (i = 0;
@@ -322 +331 @@
     int noof_partitions = 0;
 
-    long total_size = 0;
-    long plex_size = 0;
+    long total_size = 0L;
+    long plex_size = 0L;
     long smallest_partition = 999999999;
     long smallest_plex = 999999999;
-    long sp = 0;
-
-    char *tmp = NULL;
+    long sp = 0L;
+
     char *devname = NULL;
 
@@ -335 +343 @@
          && strcmp(raidlist->el[i].volname, basename(raid_device)); i++);
     if (i == raidlist->entries) {
-        mr_asprintf(&tmp,
-                 "Cannot calc size of raid device %s - cannot find it in raidlist",
-                 raid_device);
-        log_it(tmp);
-        mr_free(tmp);
+        log_it("Cannot calc size of raid device %s - cannot find it in raidlist",
+                raid_device);
         return (0);             // Isn't this more sensible than 999999999? If the raid dev !exists,
         // then it has no size, right?
@@ -400 +405 @@
     }
 
-    mr_asprintf(&tmp, "I have calculated %s's real size to be %ld",
-             raid_device, (long) smallest_plex);
-    log_it(tmp);
-    mr_free(tmp);
+    log_it("I have calculated %s's real size to be %ld", raid_device,
+            (long) smallest_plex);
     return (smallest_plex);
 #else
@@ -420 +423 @@
     long sp = 0;
 
-    /** buffers ***********************************************************/
-    char *tmp = NULL;
-
     assert(mountlist != NULL);
     assert(raidlist != NULL);
@@ -431 +431 @@
          && strcmp(raidlist->el[i].raid_device, raid_device); i++);
     if (i == raidlist->entries) {
-        mr_asprintf(&tmp,
-                 "Cannot calc size of raid device %s - cannot find it in raidlist",
-                 raid_device);
-        log_it(tmp);
-        mr_free(tmp);
+        log_it("Cannot calc size of raid device %s - cannot find it in raidlist",
+                raid_device);
         return (999999999);
     }
@@ -458 +455 @@
         total_size = smallest_partition * (noof_partitions - 1);
     }
-    mr_asprintf(&tmp, "I have calculated %s's real size to be %ld",
-             raid_device, (long) total_size);
-    log_it(tmp);
-    mr_free(tmp);
+    log_it("I have calculated %s's real size to be %ld", raid_device,
+            (long) total_size);
     return (total_size);
 #endif
@@ -498 +493 @@
     }
     for (out = 999; out == 999;) {
-        res = popup_and_get_string("Specify RAID level", prompt, tmp);
+        res = popup_and_get_string(_("Specify RAID level"), prompt, tmp);
         if (!res) {
+            mr_free(tmp);
+            mr_free(prompt);
             return;
         }
+        mr_strip_spaces(tmp);
         /* BERLIOS: Useless ??? 
         if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
@@ -516 +514 @@
         } else if (!strcmp(tmp, "raid5")) {
             out = 5;
+        } else {
+            continue;
         }
         log_it(tmp);
         mr_free(tmp);
+
         if (is_this_raid_personality_registered(out)) {
             log_it
@@ -524 +525 @@
         } else {
             if (ask_me_yes_or_no
-                ("You have chosen a RAID personality which is not registered with the kernel. Make another selection?"))
+                (_("You have chosen a RAID personality which is not registered with the kernel. Make another selection?")))
             {
                 out = 999;
@@ -556 +557 @@
          out != -1 && out != 0 && out != 1 && out != 4 && out != 5
          && out != 10;) {
-        res =
-            popup_and_get_string(_("Specify RAID level"), prompt, tmp);
+        res = popup_and_get_string(_("Specify RAID level"), prompt, tmp);
         if (!res) {
             return;
         }
+        mr_strip_spaces(tmp);
         /* BERLIOS: Useless ???
         if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
@@ -887 +888 @@
 
     /** long **************************************************************/
-    long i = 0;
+    long i = 0L;
 
     /** structures *******************************************************/
@@ -897 +898 @@
 
     /** bool *************************************************************/
-    /*  void*dummyptr; */
-    bool dummybool;
-    static bool warned_already;
+    bool dummybool = FALSE;
+    static bool warned_already = FALSE;
 
     assert(filelist != NULL);
@@ -943 +943 @@
             lines_in_flist_window = ARBITRARY_MAXIMUM;
         }
-/* do an elementary sort */
+        /* do an elementary sort */
         for (i = 1; i < lines_in_flist_window; i++) {
             if (strcmp
@@ -960 +960 @@
             }
         }
-/* write list to screen */
+        /* write list to screen */
         newtListboxClear(listbox);
         for (i = 0; i < lines_in_flist_window; i++) {
@@ -967 +967 @@
                      (g_is_path_expanded[i] ? '+' : '-'),
                      strip_path(g_strings_of_flist_window[i]));
-            // BERLIOS: this is dangerous now  => Memory leak
             if (strlen(tmp) > 71) {
                 tmp[70] = '\0';
@@ -1060 +1059 @@
 
     /** ???? **************************************************************/
-    void *curr_choice;
+    void *curr_choice = NULL;
     void *keylist[ARBITRARY_MAXIMUM];
 
     /** bool **************************************************************/
-    bool dummybool;
-
-/*  struct s_node *node; */
+    bool dummybool = FALSE;
+
 
     assert(filelist != NULL);
@@ -1163 +1161 @@
         return (0);
     } else {
-/*    popup_and_OK("You pushed 'cancel'. I shall now abort."); */
         return (1);
     }
@@ -1230 +1227 @@
     mr_asprintf(&size_str, "%lld", mountlist->el[currline].size / 1024);
 
-    newtOpenWindow(20, 5, 48, 10, "Edit entry");
+    newtOpenWindow(20, 5, 48, 10, _("Edit entry"));
     label0 = newtLabel(2, 1, _("Device:"));
     label1 = newtLabel(2, 2, _("Mountpoint:"));
@@ -1269 +1266 @@
     for (b_res = NULL; b_res != bOK && b_res != bCancel;) {
         b_res = newtRunForm(myForm);
-
         mr_free(device_str);
         mr_asprintf(&device_str, device_here);
-        strip_spaces(device_str);
+        mr_strip_spaces(device_str);
 
         mr_free(mountpoint_str);
         mr_asprintf(&mountpoint_str, mountpoint_here);
-        strip_spaces(mountpoint_str);
+        mr_strip_spaces(mountpoint_str);
 
         mr_free(format_str);
         mr_asprintf(&format_str, format_here);
-        mr_free(format_here);
-        strip_spaces(format_str);
+        mr_strip_spaces(format_str);
+
         if (b_res == bOK && strstr(device_str, RAID_DEVICE_STUB)
             && strstr(device_used_to_be, RAID_DEVICE_STUB)
@@ -1297 +1293 @@
         mr_free(mountpt_used_to_be);
 
+        mr_free(size_str);
         if (!strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)
             && strcmp(mountlist->el[currline].mountpoint, "image")) {
             mr_asprintf(&size_str, size_here);
-            strip_spaces(size_str);
+            mr_strip_spaces(size_str);
         } else {
             mr_asprintf(&size_str, "%ld",
@@ -1308 +1305 @@
             newtLabelSetText(sizeComp, size_str);
         }
-        mr_free(size_here);
 
         /* do not let user click RAID button if user has changed device_str */
@@ -1339 +1335 @@
         }
     }
-    mr_free(device_here);
-    mr_free(mountpoint_here);
-
     newtFormDestroy(myForm);
     newtPopHelpLine();
@@ -1415 +1408 @@
                  struct vinum_plex *raidrec, char *temp)
 {
-    int i;
+    int i = 0;
     bool found = FALSE;
 
@@ -1488 +1481 @@
 
     /** buffers ***********************************************************/
-    char *title_of_editraidForm_window;
+    char *title_of_editraidForm_window = NULL;
 
     /** newt **************************************************************/
@@ -1571 +1564 @@
                 mr_free(raidlevel);
                 newtListboxAppendEntry(plexesListbox, entry, keylist[i]);
+                /* BERLIOS : hope it's not necessary anymore */
                 mr_free(entry);
             }
@@ -1733 +1727 @@
         calculate_raid_device_size(mountlist, raidlist,
                                    raidrec->raid_device);
-    mr_free((void*) bkp_raidrec);
+    mr_free(bkp_raidrec);
 #endif
 }
+
+
 #ifdef __FreeBSD__
-
 
 /**
@@ -1778 +1773 @@
 
     void *keylist[ARBITRARY_MAXIMUM];
-    void *curr_choice_a, *curr_choice_u;
-    int currline_a, currline_u;
-    int i;
+    void *curr_choice_a = NULL, *curr_choice_u = NULL;
+    int currline_a = 0, currline_u = 0;
+    int i = 0;
 
     struct mountlist_itself *unallocparts = NULL;
@@ -1800 +1795 @@
         switch (raidrec->raidlevel) {
         case -1:
-            mr_asprintf(&tmp, "concat");
+            mr_asprintf(&tmp, _("concat"));
             break;
         case 0:
-            mr_asprintf(&tmp, "striped");
+            mr_asprintf(&tmp, _("striped"));
             break;
         case 5:
-            mr_asprintf(&tmp, "raid5");
+            mr_asprintf(&tmp, _("raid5"));
             break;
         default:
@@ -1832 +1827 @@
         bDelete = newtCompactButton(42, 16, _("Delete"));
 
-
-        //  plexesListbox = newtListbox (2, 7, 9, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
         unallocListbox =
             newtListbox(2, 7, 7, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
@@ -2026 +2019 @@
     assert(raidlist != NULL);
 
+    mr_asprintf(&flaws_str_A, "xxxxxxxxx");
+    mr_asprintf(&flaws_str_B, "xxxxxxxxx");
+    mr_asprintf(&flaws_str_C, "xxxxxxxxx");
     if (mountlist->entries > ARBITRARY_MAXIMUM) {
         log_to_screen(_("Arbitrary limits suck, man!"));
@@ -2043 +2039 @@
             _("Format"), _("Size (MB)"));
     headerMsg = newtLabel(2, 1, tmp);
-    flawsLabelA = newtLabel(2, 13, "x");
-    flawsLabelB = newtLabel(2, 14, "x");
-    flawsLabelC = newtLabel(2, 15, "x");
+    flawsLabelA = newtLabel(2, 13, flaws_str_A);
+    flawsLabelB = newtLabel(2, 14, flaws_str_B);
+    flawsLabelC = newtLabel(2, 15, flaws_str_C);
+    mr_free(flaws_str_A);
+    mr_free(flaws_str_B);
+    mr_free(flaws_str_C);
+
     partitionsListbox =
         newtListbox(2, 2, 10, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
@@ -2123 +2123 @@
         return (0);
     } else {
-        /* popup_and_OK("You pushed 'cancel'. I shall now abort."); */
         return (1);
     }
@@ -2263 +2262 @@
 
   /** bool **************************************************************/
-    bool done;
+    bool done = FALSE;
 
     assert(disklist != NULL);
@@ -2364 +2363 @@
         if (popup_and_get_string
             (_("ISO Mode - format"),
-             _
-             ("What is the disk format of the device? (Hit ENTER if you don't know.)"),
+             _("What is the disk format of the device? (Hit ENTER if you don't know.)"),
              isodir_format)) {
             if (popup_and_get_string
                 (_("ISO Mode - path"),
-                 _
-                 ("At what path on this device can the ISO files be found?"),
+                 _("At what path on this device can the ISO files be found?"),
                  isodir_path)) {
                 // Same pb:
@@ -2532 +2529 @@
 
     newtListboxClear(listbox);
-//  sort_mountlist_by_device (mountlist);
     for (i = 0; i < ARBITRARY_MAXIMUM; i++) {
         keylist[i] = (void *) i;
@@ -2669 +2665 @@
                                                    char *new_dev)
 {
-    /** buffers ********************************************************/
-    char *tmp;
 
     /** int ************************************************************/
@@ -2682 +2676 @@
     pos = which_raid_device_is_using_this_partition(raidlist, old_dev);
     if (pos < 0) {
-        mr_asprintf(&tmp, "No need to rejig %s in raidlist: it's not listed.",
+        log_it("No need to rejig %s in raidlist: it's not listed.",
                 old_dev);
-        log_it(tmp);
-        mr_free(tmp);
     } else {
         if ((j =
@@ -2717 +2709 @@
 #endif
         else {
-            mr_asprintf(&tmp,
-                    "%s is supposed to be listed in this raid dev but it's not...",
+            log_it("%s is supposed to be listed in this raid dev but it's not...",
                     old_dev);
-            log_it(tmp);
-            mr_free(tmp);
         }
     }
@@ -2829 +2818 @@
     newtPushHelpLine(help_text);
     mr_free(help_text);
+
     for (b_res = (newtComponent) 12345; b_res != bOK && b_res != bCancel;) {
         headerMsg = newtLabel(1, 1, header_text);
@@ -2850 +2840 @@
         b_res = newtRunForm(myForm);
         if (b_res == bOK || b_res == bCancel) { /* do nothing */
-// That's OK. At the end of this subroutine (after this do/while loop),
-// we'll throw away the changes if Cancel was pushed.
+            // That's OK. At the end of this subroutine (after this do/while loop),
+            // we'll throw away the changes if Cancel was pushed.
         } else {
             curr_choice = newtListboxGetCurrent(partitionsListbox);
@@ -2895 +2885 @@
                     mr_free(tmp);
                     mr_free(sz_res);
+
                     redraw_disklist(disklist, keylist, partitionsListbox);
                 }
@@ -2914 +2905 @@
                sizeof(struct list_of_disks));
     }
-    mr_free((void*) bkp_raidrec);
-    mr_free((void*) bkp_disklist);
-    mr_free((void*) bkp_raidlist);
-    mr_free((void*) unallocated_raid_partitions);
+    mr_free(bkp_raidrec);
+    mr_free(bkp_disklist);
+    mr_free(bkp_raidlist);
+    mr_free(unallocated_raid_partitions);
 }
 #endif