Changeset 2211 in MondoRescue for branches/2.2.9/mondo/src/common/newt-specific.c

Timestamp:

Jun 3, 2009, 7:10:19 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3089@localhost: bruno | 2009-05-18 06:41:05 +0200

• move call to asprintf to call to mr_asprintf (suppress a compiler warning)
• remove all the most obvious bad call to strcat and replace by mr_strcat as appropriate

File:

• branches/2.2.9/mondo/src/common/newt-specific.c (modified) (16 diffs)

branches/2.2.9/mondo/src/common/newt-specific.c

@@ -19 +19 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "newt-specific.h"
@@ -263 +264 @@
 char *tmp1 = NULL;
 
-    asprintf(&tmp,"ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"", ps_options, str , ps_proc_id);
+    mr_asprintf(&tmp,"ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"", ps_options, str , ps_proc_id);
     run_program_and_log_output(tmp, TRUE);
     if (strlen(tmp) > 0) {
-        asprintf(&tmp1,"kill `%s`", tmp);
+        mr_asprintf(&tmp1,"kill `%s`", tmp);
         run_program_and_log_output(tmp1, TRUE);
         paranoid_free(tmp1);
@@ -386 +387 @@
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
         if (g_selfmounted_isodir) {
-            asprintf(&command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
             paranoid_free(command);
-            asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+            mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
             paranoid_free(command);
@@ -405 +406 @@
         printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
         if (strstr(bkpinfo->tmpdir ,"mondo.tmp.") != NULL) {
-            asprintf(&command, "rm -Rf %s %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
+            mr_asprintf(&command, "rm -Rf %s %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
             system(command);
             paranoid_free(command);
@@ -956 +957 @@
         /*@ buffers ********************************************************** */
         char *timeline_str;
-        char *pcline_str;
-        char *taskprogress;
+        char *pcline_str = NULL;
+        char *taskprogress = NULL;
 
         /*@ int ************************************************************** */
@@ -965 +966 @@
 
         malloc_string(timeline_str);
-        malloc_string(pcline_str);
-        malloc_string(taskprogress);
         timeline_str[0] = '\0';
 //  log_it("update_eval_call_form called");
@@ -997 +996 @@
                     time_remaining % 60);
             if (percentage < 3) {
-                sprintf(pcline_str, " Working");
+                mr_asprintf(&pcline_str, " Working");
                 for (j = 0; j < g_mysterious_dot_counter; j++) {
-                    strcat(pcline_str, ".");
+                    mr_strcat(pcline_str, ".");
                 }
                 for (; j < 27; j++) {
-                    strcat(pcline_str, " ");
+                    mr_strcat(pcline_str, " ");
                 }
-                sprintf(pcline_str + strlen(pcline_str), " %c",
-                        special_dot_char(g_mysterious_dot_counter));
+                mr_strcat(pcline_str, " %c", special_dot_char(g_mysterious_dot_counter));
             } else {
-                sprintf(pcline_str, " %3d%% done              %3d%% to go",
+                mr_asprintf(&pcline_str, " %3d%% done              %3d%% to go",
                         percentage, 100 - percentage);
             }
             if (g_text_mode) {
-                sprintf(taskprogress, "TASK:  [");
+                mr_asprintf(&taskprogress, "TASK:  [");
                 for (i = 0; i < percentage; i += 5) {
-                    strcat(taskprogress, "*");
+                    mr_strcat(taskprogress, "*");
                 }
                 for (; i < 100; i += 5) {
-                    strcat(taskprogress, ".");
+                    mr_strcat(taskprogress, ".");
                 }
                 if (percentage >= 3) {
-                    sprintf(taskprogress + strlen(taskprogress),
-                            "] %3d%% done; %2ld:%02ld to go", percentage,
+                    mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage,
                             time_remaining / 60, time_remaining % 60);
                     printf("---evalcall---1--- %s\n",
@@ -1027 +1024 @@
                     printf("---evalcall---E---\n");
                 }
+                paranoid_free(taskprogress);
             } else {
                 newtScaleSet(g_isoform_scale,
@@ -1037 +1035 @@
                 }
             }
+            paranoid_free(pcline_str);
         }
         if (!g_text_mode) {
@@ -1043 +1042 @@
         }
         paranoid_free(timeline_str);
-        paranoid_free(pcline_str);
-        paranoid_free(taskprogress);
     }
 
@@ -1099 +1096 @@
         char *percentline_str;
         char *timeline_str;
-        char *taskprogress;
+        char *taskprogress = NULL;
         char *tmp;
 
@@ -1105 +1102 @@
         percentline_str = malloc(MAX_NEWT_COMMENT_LEN);
         timeline_str = malloc(MAX_NEWT_COMMENT_LEN);
-        taskprogress = malloc(MAX_NEWT_COMMENT_LEN);
         malloc_string(tmp);
         if (!g_text_mode) {
@@ -1159 +1155 @@
             printf("---progress-form---3--- %s\n", blurb3);
             printf("---progress-form---E---\n");
-            sprintf(taskprogress, "TASK:  [");
+            mr_asprintf(&taskprogress, "TASK:  [");
             for (i = 0; i < percentage; i += 5) {
-                strcat(taskprogress, "*");
+                mr_strcat(taskprogress, "*");
             }
             for (; i < 100; i += 5) {
-                strcat(taskprogress, ".");
+                mr_strcat(taskprogress, ".");
             }
             if (percentage > 100) {
                 log_msg(2, "percentage = %d", percentage);
             }
-            sprintf(taskprogress + strlen(taskprogress),
-                    "] %3d%c", percentage, '%');
-            sprintf(taskprogress + strlen(taskprogress),
-                    " done; %2ld:%02ld to go",
+            mr_strcat(taskprogress, "] %3d%c", percentage, '%');
+            mr_strcat(taskprogress, " done; %2ld:%02ld to go",
                     time_remaining / 60, time_remaining % 60);
             printf("---progress-form---4--- %s\n", taskprogress);
+            paranoid_free(taskprogress);
         } else {
             center_string(blurb1, 54);
@@ -1199 +1194 @@
         paranoid_free(percentline_str);
         paranoid_free(timeline_str);
-        paranoid_free(taskprogress);
         paranoid_free(tmp);
     }
@@ -1414 +1408 @@
         }
 
-        asprintf(&tmp1,"%s/icantfindthesefiles.txt",bkpinfo->tmpdir);
+        mr_asprintf(&tmp1,"%s/icantfindthesefiles.txt",bkpinfo->tmpdir);
         if (!(fout = fopen(tmp1, "a"))) {
             log_msg(2, "Can't write to %s", tmp1);
@@ -1503 +1497 @@
     char *filelist_entry_to_string(struct s_filelist_entry *flentry) {
         static char comment[100];
-        char *tmp;
+        char *tmp = NULL;
 
         iamhere("entering");
-        malloc_string(tmp);
         assert(flentry != NULL);
         if (flentry->severity == 0) {
-            strcpy(tmp, "0   ");
+            mr_asprintf(&tmp, "0   ");
         } else if (flentry->severity == 1) {
-            strcpy(tmp, "low ");
+            mr_asprintf(&tmp, "low ");
         } else if (flentry->severity == 2) {
-            strcpy(tmp, "med ");
-        } else {
-            strcpy(tmp, "high");
-        }
-        strcat(tmp, "  ");
-        strncat(tmp, flentry->filename, 100);
-        tmp[98] = '\0';
-        strcpy(comment, tmp);
+            mr_asprintf(&tmp, "med ");
+        } else {
+            mr_asprintf(&tmp, "high");
+        }
+        mr_strcat(tmp, "  ");
+        mr_strcat(tmp, flentry->filename);
+        strncpy(comment, tmp, 99);
         paranoid_free(tmp);
+
         iamhere("leaving");
         return (comment);