Changeset 2313 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-string.c

Timestamp:

Aug 18, 2009, 2:29:11 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3324@localhost: bruno | 2009-07-31 23:42:57 +0200
percent_media_full_comment now allocates memory

File:

• branches/2.2.10/mondo/src/common/libmondo-string.c (modified) (4 diffs)

branches/2.2.10/mondo/src/common/libmondo-string.c

@@ -155 +155 @@
         tmp[j - 6] = ',';
         strcpy(tmp + j - 5, pos_w_commas + j - 6);
-//      tmp[j-2] = ',';
-//      strcpy(tmp+j-1, pos_w_commas+j-3);
         strcpy(pos_w_commas, tmp);
     }
@@ -1087 +1085 @@
     /*@ int *********************************************** */
     int percentage;
-    int j;
 
     /*@ buffers ******************************************* */
-    static char outstr[MAX_STR_LEN];
+    char *outstr = NULL;
     char *pos_w_commas, *tmp;
     char *mds = NULL;
 
     assert(bkpinfo != NULL);
-    malloc_string(pos_w_commas);
-    malloc_string(tmp);
-    sprintf(tmp, "%lld", g_tape_posK);
-    strcpy(pos_w_commas, commarize(tmp));
-
-
-
-    if (bkpinfo->media_size[g_current_media_number] <= 0)
-//    { fatal_error( "percentage_media_full_comment() - unknown media size"); }
-    {
-        sprintf(outstr, "Volume %d: %s kilobytes archived so far",
-                g_current_media_number, pos_w_commas);
+
+    if (bkpinfo->media_size[g_current_media_number] <= 0) {
+        malloc_string(pos_w_commas);
+        malloc_string(tmp);
+        sprintf(tmp, "%lld", g_tape_posK);
+        strcpy(pos_w_commas, commarize(tmp));
+        paranoid_free(tmp);
+        mr_asprintf(&outstr, "Volume %d: %s kilobytes archived so far", g_current_media_number, pos_w_commas);
+        paranoid_free(pos_w_commas);
         return (outstr);
     }
@@ -1118 +1112 @@
             percentage = 100;
         }
-        sprintf(outstr, "Volume %d: [", g_current_media_number);
+        mr_asprintf(&outstr, "Volume %d: [", g_current_media_number);
     } else {
         percentage =
@@ -1124 +1118 @@
                    bkpinfo->media_size[g_current_media_number]);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        sprintf(outstr, "%s %d: [", mds, g_current_media_number);
+        mr_asprintf(&outstr, "%s %d: [", mds, g_current_media_number);
         mr_free(mds);
     }
     for (j = 0; j < percentage; j += 5) {
-        strcat(outstr, "*");
+        mr_strcat(outstr, "*");
     }
     for (; j < 100; j += 5) {
-        strcat(outstr, ".");
-    }
-    j = (int) strlen(outstr);
-    sprintf(outstr + j, "] %d%% used", percentage);
-    paranoid_free(pos_w_commas);
-    paranoid_free(tmp);
+        mr_strcat(outstr, ".");
+    }
+    mr_strcat(outstr, "] %d%% used", percentage);
     return (outstr);
 }