Changeset 2300 in MondoRescue

Timestamp:

Jul 23, 2009, 7:40:07 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Replace sprintf by mr_asprintf in mondo-rstr-newt.c (end of first modifications round)

Location:

branches/2.2.10

Files:

• mondo/src/mondorestore/mondo-rstr-newt.c (modified) (50 diffs)
• tools/quality (modified) (1 diff)

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

@@ -51 +51 @@
 {
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     /** newt **************************************************************/
@@ -77 +77 @@
     newtPushHelpLine
         ("   Add one of the following unallocated RAID partitions to this RAID device.");
-    sprintf(tmp, "%-26s %s", "Device", "Size");
+    mr_asprintf(&tmp, "%-26s %s", "Device", "Size");
     headerMsg = newtLabel(1, 1, tmp);
     partitionsListbox =
@@ -111 +111 @@
     }
     newtFormDestroy(myForm);
+    mr_free(tmp);
     newtPopWindow();
     newtPopHelpLine();
@@ -177 +178 @@
 #endif
     size_str[0] = '\0';
-    /* sprintf(size_str,""); */
     newtOpenWindow(20, 5, 48, 10, "Add entry");
     label0 = newtLabel(2, 1, "Device:    ");
@@ -316 +316 @@
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char tmp = NULL;
 
 
@@ -325 +325 @@
          && strcmp(raidlist->el[i].volname, basename(raid_device)); i++);
     if (i == raidlist->entries) {
-        sprintf(tmp,
-                "Cannot calc size of raid device %s - cannot find it in raidlist",
-                raid_device);
+        mr_asprintf(&tmp, "Cannot calc size of raid device %s - cannot find it in raidlist", raid_device);
         log_it(tmp);
+        mr_free(tmp);
         return (0);             // Isn't this more sensible than 999999999? If the raid dev !exists,
         // then it has no size, right?
@@ -389 +388 @@
     }
 
-    sprintf(tmp, "I have calculated %s's real size to be %ld", raid_device,
-            (long) smallest_plex);
+    mr_asprintf(&tmp, "I have calculated %s's real size to be %ld", raid_device, (long) smallest_plex);
     log_it(tmp);
+    mr_free(tmp);
     return (smallest_plex);
 #else
@@ -409 +408 @@
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char tmp = NULL;
 
     assert(mountlist != NULL);
@@ -419 +418 @@
          && strcmp(raidlist->el[i].raid_device, raid_device); i++);
     if (i == raidlist->entries) {
-        sprintf(tmp,
-                "Cannot calc size of raid device %s - cannot find it in raidlist",
-                raid_device);
+        mr_asprintf(&tmp, "Cannot calc size of raid device %s - cannot find it in raidlist", raid_device);
         log_it(tmp);
+        mr_free(tmp);
         return (999999999);
     }
@@ -445 +443 @@
         total_size = smallest_partition * (noof_partitions - 1);
     }
-    sprintf(tmp, "I have calculated %s's real size to be %ld", raid_device,
-            (long) total_size);
+    mr_asprintf(&tmp, "I have calculated %s's real size to be %ld", raid_device, (long) total_size);
     log_it(tmp);
+    mr_free(tmp);
     return (total_size);
 #endif
@@ -471 +469 @@
     /** buffers ***********************************************************/
     char tmp[MAX_STR_LEN];
-    char prompt[MAX_STR_LEN];
-    char sz[MAX_STR_LEN];
-
-    sprintf(prompt,
-            "Please enter the RAID level you want. (concat, striped, raid5)");
+    char *prompt = NULL;
+    char *sz = NULL;
+
+    mr_asprintf(&prompt, "Please enter the RAID level you want. (concat, striped, raid5)");
     if (raidrec->raidlevel == -1) {
         strcpy(tmp, "concat");
@@ -486 +483 @@
         res = popup_and_get_string("Specify RAID level", prompt, tmp, 10);
         if (!res) {
+            mr_free(prompt);
             return;
         }
         strip_spaces(tmp);
         if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
-            strcpy(sz, tmp);
+            mr_asprintf(&sz, "%s", tmp);
             strncpy(tmp, sz + 1, strlen(sz) - 2);
             tmp[strlen(sz) - 2] = '\0';
+            mr_free(sz);
         }
         if (!strcmp(tmp, "concat")) {
@@ -513 +512 @@
         }
     }
+    mr_free(prompt);
     raidrec->raidlevel = out;
 #else
     /** buffers ***********************************************************/
     char tmp[MAX_STR_LEN];
-    char personalities[MAX_STR_LEN];
-    char prompt[MAX_STR_LEN];
-    char sz[MAX_STR_LEN];
+    char *personalities = NULL;
+    char *prompt = NULL;
+    char *sz = NULL;
     int out = 0, res = 0;
 
@@ -526 +526 @@
     system
         ("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
-    strcpy(personalities,
-           last_line_of_file("/tmp/raid-personalities.txt"));
-    sprintf(prompt, "Please enter the RAID level you want. %s",
-            personalities);
+    mr_asprintf(&personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt"));
+    mr_asprintf(&prompt, "Please enter the RAID level you want. %s", personalities);
+    mr_free(personalities);
+
     if (raidrec->raid_level == -1) {
         strcpy(tmp, "linear");
@@ -540 +540 @@
         res = popup_and_get_string("Specify RAID level", prompt, tmp, 10);
         if (!res) {
+            mr_free(prompt);
             return;
         }
         strip_spaces(tmp);
         if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
-            strcpy(sz, tmp);
+            mr_asprintf(&sz, "%s", tmp);
             strncpy(tmp, sz + 1, strlen(sz) - 2);
             tmp[strlen(sz) - 2] = '\0';
+            mr_free(sz);
         }
         if (!strcmp(tmp, "linear")) {
@@ -567 +569 @@
         }
     }
+    mr_free(prompt);
     raidrec->raid_level = out;
 #endif
@@ -592 +595 @@
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     assert(mountlist != NULL);
@@ -604 +607 @@
              pos++);
         if (pos < mountlist->entries) {
-            sprintf(tmp,
-                    "Deleting partition %s cos it was part of a now-defunct RAID",
-                    mountlist->el[pos].device);
+            mr_asprintf(&tmp, "Deleting partition %s cos it was part of a now-defunct RAID", mountlist->el[pos].device);
             log_it(tmp);
+            mr_free(tmp);
+
             memcpy((void *) &mountlist->el[pos],
                    (void *) &mountlist->el[mountlist->entries - 1],
@@ -633 +636 @@
     /** int ***************************************************************/
     int pos = 0;
+    int res = 0;
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     assert(disklist != NULL);
     assert_string_is_neither_NULL_nor_zerolength(raid_device);
 
-    sprintf(tmp, "Delete %s from RAID device %s - are you sure?",
-            disklist->el[currline].device, raid_device);
-    if (!ask_me_yes_or_no(tmp)) {
+    mr_asprintf(&tmp, "Delete %s from RAID device %s - are you sure?", disklist->el[currline].device, raid_device);
+    res = ask_me_yes_or_no(tmp);
+    mr_free(tmp);
+
+    if (!res) {
         return;
     }
     for (pos = currline; pos < disklist->entries - 1; pos++) {
-        /* memcpy((void*)&disklist->el[pos], (void*)&disklist->el[pos+1], sizeof(struct s_disk)); */
         strcpy(disklist->el[pos].device, disklist->el[pos + 1].device);
     }
@@ -672 +677 @@
     /** int ***************************************************************/
     int pos = 0;
+    int res = 0;
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     char device[MAX_STR_LEN];
 
@@ -683 +689 @@
     assert(keylist != NULL);
 
+    /* BERLIOS: Why isn't device initialized here ? what is expected */
     pos =
         which_raid_device_is_using_this_partition(raidlist,
@@ -688 +695 @@
                                                   device);
     if (pos >= 0) {
-        sprintf(tmp, "Cannot delete %s: it is in use by RAID device %s",
-                mountlist->el[currline].device,
-                raidlist->el[pos].OSSWAP(raid_device, volname));
+        mr_asprintf(&tmp, "Cannot delete %s: it is in use by RAID device %s", mountlist->el[currline].device, raidlist->el[pos].OSSWAP(raid_device, volname));
         popup_and_OK(tmp);
+        mr_free(tmp);
         return;
     }
-    sprintf(tmp, "Delete %s - are you sure?",
-            mountlist->el[currline].device);
-    if (!ask_me_yes_or_no(tmp)) {
+    mr_asprintf(&tmp, "Delete %s - are you sure?", mountlist->el[currline].device);
+    res = ask_me_yes_or_no(tmp);
+    mr_free(tmp);
+
+    if (!res) {
         return;
     }
@@ -739 +747 @@
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     assert(mountlist != NULL);
@@ -749 +757 @@
         return;
     }
-    sprintf(tmp, "Do you want me to delete %s's partitions, too?", device);
+    mr_asprintf(&tmp, "Do you want me to delete %s's partitions, too?", device);
     delete_partitions_too = ask_me_yes_or_no(tmp);
     if (delete_partitions_too) {
@@ -793 +801 @@
         items--;
     }
+    mr_free(tmp);
     raidlist->entries = items;
 }
@@ -808 +817 @@
 
     /** buffers ************************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
+    int res = 0;
 
     /** structures *********************************************************/
@@ -816 +826 @@
 
     av = &raidrec->additional_vars;
-    sprintf(tmp, "Delete %s - are you sure?", av->el[lino].label);
-    if (ask_me_yes_or_no(tmp)) {
+    mr_asprintf(&tmp, "Delete %s - are you sure?", av->el[lino].label);
+    res = ask_me_yes_or_no(tmp);
+    mr_free(tmp);
+
+    if (res) {
         if (!strcmp(av->el[lino].label, "persistent-superblock")
             || !strcmp(av->el[lino].label, "chunk-size")) {
-            sprintf(tmp, "%s must not be deleted. It would be bad.",
-                    av->el[lino].label);
+            mr_asprintf(&tmp, "%s must not be deleted. It would be bad.", av->el[lino].label);
             popup_and_OK(tmp);
+            mr_free(tmp);
         } else {
             memcpy((void *) &av->el[lino], (void *) &av->el[av->entries--],
@@ -858 +871 @@
     static char current_filename[MAX_STR_LEN];
     char tmp[MAX_STR_LEN + 2];
+    char *tmp1 = NULL;
 
     /** bool *************************************************************/
@@ -888 +902 @@
                 if (!warned_already) {
                     warned_already = TRUE;
-                    sprintf(tmp,
-                            "Too many lines. Displaying first %d entries only. Close a directory to see more.",
-                            ARBITRARY_MAXIMUM);
-                    popup_and_OK(tmp);
+                    mr_asprintf(&tmp1, "Too many lines. Displaying first %d entries only. Close a directory to see more.", ARBITRARY_MAXIMUM);
+                    popup_and_OK(tmp1);
+                    mr_free(tmp1);
                 }
             } else {
@@ -910 +923 @@
                 (g_strings_of_flist_window[i],
                  g_strings_of_flist_window[i - 1]) < 0) {
-                strcpy(tmp, g_strings_of_flist_window[i]);
+                mr_asprintf(&tmp1, g_strings_of_flist_window[i]);
                 strcpy(g_strings_of_flist_window[i],
                        g_strings_of_flist_window[i - 1]);
-                strcpy(g_strings_of_flist_window[i - 1], tmp);
+                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];
@@ -1018 +1032 @@
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     /** bool **************************************************************/
@@ -1066 +1080 @@
                 indexno = 0;
             }
-            sprintf(tmp, "You selected '%s'",
-                    g_strings_of_flist_window[indexno]);
+            mr_asprintf(&tmp, "You selected '%s'", g_strings_of_flist_window[indexno]);
             log_it(tmp);
+            mr_free(tmp);
+
             if (b_res == bMore) {
                 g_is_path_expanded[indexno] = TRUE;
@@ -1164 +1179 @@
     char size_str[MAX_STR_LEN];
     char format_str[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     char device_used_to_be[MAX_STR_LEN];
     char mountpt_used_to_be[MAX_STR_LEN];
@@ -1263 +1278 @@
                                                  device);
                 if (j < 0) {
-                    sprintf(tmp,
-                            "/etc/raidtab does not have an entry for %s; please delete it and add it again",
-                            mountlist->el[currline].device);
+                    mr_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);
+                    mr_free(tmp);
                 } else {
                     log_it("edit_raidlist_entry - calling");
@@ -1350 +1364 @@
     }
     if (!found) {
-        sprintf(raidlist->disks.el[raidlist->disks.entries].name,
-                "drive%i", raidlist->disks.entries);
-        sprintf(raidrec->sd[raidrec->subdisks].which_device, "drive%i",
-                raidlist->disks.entries);
+        sprintf(raidlist->disks.el[raidlist->disks.entries].name, "drive%i", raidlist->disks.entries);
+        sprintf(raidrec->sd[raidrec->subdisks].which_device, "drive%i", raidlist->disks.entries);
         strcpy(raidlist->disks.el[raidlist->disks.entries++].device, temp);
     }
@@ -1426 +1438 @@
     void *keylist[10];
     void *curr_choice;
+    char *raidlevel = NULL;
+    char *chunksize = NULL;
+    char *msg = NULL;
 
     int currline2 = 0;
+    int res = 0;
 
     log_it("Started edit_raidlist_entry");
@@ -1457 +1473 @@
             keylist[i] = (void *) i;
             if (i < raidrec->plexes) {
-                char pname[64], entry[MAX_STR_LEN], raidlevel[64],
-                    chunksize[64];
+                char pname[64], entry[MAX_STR_LEN];
                 switch (raidrec->plex[i].raidlevel) {
                 case -1:
-                    strcpy(raidlevel, "concat");
+                    mr_asprintf(&raidlevel, "concat");
                     break;
                 case 0:
-                    strcpy(raidlevel, "striped");
+                    mr_asprintf(&raidlevel, "striped");
                     break;
                 case 5:
-                    strcpy(raidlevel, "raid5");
+                    mr_asprintf(&raidlevel, "raid5");
                     break;
                 default:
-                    sprintf(raidlevel, "raid%i",
-                            raidrec->plex[i].raidlevel);
+                    mr_asprintf(&raidlevel, "raid%i", raidrec->plex[i].raidlevel);
                     break;
                 }
 
                 if (raidrec->plex[i].raidlevel == -1) {
-                    strcpy(chunksize, "N/A");
+                    mr_asprintf(&chunksize, "N/A");
                 } else {
-                    sprintf(chunksize, "%dk", raidrec->plex[i].stripesize);
+                    mr_asprintf(&chunksize, "%dk", raidrec->plex[i].stripesize);
                 }
                 snprintf(pname, 64, "%s.p%i", raidrec->volname, i);
@@ -1484 +1498 @@
                          pname, raidlevel, chunksize,
                          raidrec->plex[i].subdisks);
+                mr_free(raidlevel);
+                mr_free(chunksize);
+
                 newtListboxAppendEntry(plexesListbox, entry, keylist[i]);
             }
@@ -1505 +1522 @@
 
         if (b_res == bDelete) {
-            char msg[MAX_STR_LEN];
-            sprintf(msg, "Are you sure you want to delete %s.p%i?",
-                    raidrec->volname, currline2);
-            if (ask_me_yes_or_no(msg)) {
+            mr_asprintf(&msg, "Are you sure you want to delete %s.p%i?", raidrec->volname, currline2);
+            res = ask_me_yes_or_no(msg);
+            mr_free(msg);
+
+            if (res) {
                 log_it("Deleting RAID plex");
                 memcpy((void *) &raidrec->plex[currline2],
@@ -1850 +1868 @@
             }
         }
-#if 0
-    } else {
-        edit_raid_subdisk(raidlist, raidrec, &raidrec->sd[currline3],
-                          currline3);
-    }
-#endif
     newtFormDestroy(editraidForm);
     newtRefresh();
@@ -1894 +1906 @@
     }
 }
-
-
-/* I'm not racist against white people. I just don't like people who think Liberia is near Spain.       - Hugo, 09/01/2001 */
 
 #endif
@@ -1937 +1946 @@
 
     /** buffers **********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     char *flaws_str_A = NULL;
     char *flaws_str_B = NULL;
@@ -1961 +1970 @@
     bCancel = newtCompactButton(i += 12, 17, "Cancel");
     bOK = newtCompactButton(i += 12, 17, "  OK  ");
-    sprintf(tmp, "%-24s %-24s %-8s  %s", "Device", "Mountpoint", "Format",
-            "Size (MB)");
+    mr_asprintf(&tmp, "%-24s %-24s %-8s  %s", "Device", "Mountpoint", "Format", "Size (MB)");
     headerMsg = newtLabel(2, 1, tmp);
     flawsLabelA = newtLabel(2, 13, flaws_str_A);
@@ -1997 +2005 @@
         } else if (b_res == bReload) {
             if (ask_me_yes_or_no("Reload original mountlist?")) {
-/*
-This would be really dumb. RAIDTAB_FNAME is #define'd.   --- Hugo, 2003/04/24
-          if (!RAIDTAB_FNAME[0])
-        {
-                  strcpy(RAIDTAB_FNAME, "/etc/raidtab");
-          log_it("Warning - raidtab_fname is blank. Assuming %s", g_raidtab_fname);
-        }
-*/
                 load_mountlist(mountlist, mountlist_fname);
                 load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
@@ -2038 +2038 @@
         }
     }
-    paranoid_free(flaws_str_A);
-    paranoid_free(flaws_str_B);
-    paranoid_free(flaws_str_C);
     newtFormDestroy(myForm);
+
+    mr_free(flaws_str_A);
+    mr_free(flaws_str_B);
+    mr_free(flaws_str_C);
+    mr_free(tmp);
+
     newtPopWindow();
     newtPopHelpLine();
@@ -2221 +2224 @@
     int i = 0;
 #ifdef __FreeBSD__
-    char vdev[64];
+    char *vdev = NULL;
+    int res = 0;
 #else
 // Linux
@@ -2231 +2235 @@
 #ifdef __FreeBSD__
     for (i = 0; i < raidlist->entries; i++) {
-        sprintf(vdev, "/dev/vinum/%s", raidlist->el[i].volname);
-        if (!strcmp(device, vdev))
+        mr_asprintf(&vdev, "/dev/vinum/%s", raidlist->el[i].volname);
+        res = strcmp(device, vdev);
+        mr_free(vdev);
+
+        if (!res)
             break;
     }
@@ -2595 +2602 @@
 {
     /** buffers ********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     /** int ************************************************************/
@@ -2607 +2614 @@
     pos = which_raid_device_is_using_this_partition(raidlist, old_dev);
     if (pos < 0) {
-        sprintf(tmp, "No need to rejig %s in raidlist: it's not listed.",
-                old_dev);
+        mr_asprintf(&tmp, "No need to rejig %s in raidlist: it's not listed.", old_dev);
         log_it(tmp);
+        mr_free(tmp);
     } else {
         if ((j =
@@ -2641 +2648 @@
 #endif
         else {
-            sprintf(tmp,
-                    "%s is supposed to be listed in this raid dev but it's not...",
-                    old_dev);
+            mr_asprintf(&tmp, "%s is supposed to be listed in this raid dev but it's not...", old_dev);
             log_it(tmp);
+            mr_free(tmp);
         }
     }

branches/2.2.10/tools/quality

@@ -28 +28 @@
 
 # How many sprintf/strcat/strcpy vs asprintf are they
-for s in asprintf mr_asprintf sprintf snprintf strcat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline MAX_STR_LEN getcwd goto free mr_free paranoid_free paranoid_system; do
+for s in asprintf mr_asprintf sprintf snprintf strcat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline MAX_STR_LEN getcwd goto free mr_free paranoid_free paranoid_system mr_system assert; do
     echo "monodrescue $s usage : "
     tot=0