Changeset 783 in MondoRescue for trunk/mondo/mondo/common/libmondo-string.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/common/libmondo-string.c (modified) (8 diffs)

trunk/mondo/mondo/common/libmondo-string.c

@@ -14 +14 @@
 #include "newt-specific-EXT.h"
 #include "libmondo-tools-EXT.h"
+#include <math.h>
 
 /*@unused@*/
@@ -136 +137 @@
 
 
-/*
- * Add commas every third place in @p input.
- * @param input The string to commarize.
- * @return The string with commas.
- * @note The returned string points to static storage that will be overwritten with each call.
- */
-char *commarize(char *input)
-{
-    char *pos_w_commas;
-    static char output[MAX_STR_LEN];
-    char *tmp;
-    int j;
-
-    assert(input != NULL);
-
-    asprintf(&tmp, "%s", input);
-    if (strlen(tmp) > 6) {
-        asprintf(&pos_w_commas, "%s", tmp);
-        j = (int) strlen(pos_w_commas);
-        tmp[j - 6] = ',';
-        strcpy(tmp + j - 5, pos_w_commas + j - 6);
-        paranoid_free(pos_w_commas);
-        asprintf(&pos_w_commas, "%s", tmp);
-    }
-    if (strlen(tmp) > 3) {
-        j = (int) strlen(tmp);
-        asprintf(&pos_w_commas, "%s", tmp);
-        pos_w_commas[j - 3] = ',';
-        strcpy(pos_w_commas + j - 2, tmp + j - 3);
-    } else {
-        asprintf(&pos_w_commas, "%s", tmp);
-    }
-    strcpy(output, pos_w_commas);
-    paranoid_free(pos_w_commas);
-    paranoid_free(tmp);
-    return (output);
-}
-
-
 /**
  * Turn an entry from the RAID editor's disklist into a GUI-friendly string.
@@ -601 +563 @@
 
     /*@ initialize ****************************************************** */
-    assert(flaws_str_A != NULL);
-    assert(flaws_str_B != NULL);
-    assert(flaws_str_C != NULL);
     assert(flaws_str != NULL);
 
-    flaws_str_A[0] = flaws_str_B[0] = flaws_str_C[0] = '\0';
-
+    flaws_str_A = NULL;
+    flaws_str_B = NULL;
+    flaws_str_C = NULL;
 
     if (!res && !strlen(flaws_str)) {
@@ -613 +573 @@
     }
     if (strlen(flaws_str) > 0) {
-        sprintf(flaws_str_A, "%s", flaws_str + 1);
+        asprintf(&flaws_str_A, "%s", flaws_str + 1);
     }
     if (strlen(flaws_str_A) >= 74) {
         for (i = 74; flaws_str_A[i] != ' '; i--);
-        strcpy(flaws_str_B, flaws_str_A + i + 1);
+        asprintf(&flaws_str_B, "%s", flaws_str_A + i + 1);
         flaws_str_A[i] = '\0';
     }
     if (strlen(flaws_str_B) >= 74) {
         for (i = 74; flaws_str_B[i] != ' '; i--);
-        strcpy(flaws_str_C, flaws_str_B + i + 1);
+        asprintf(&flaws_str_C, "%s", flaws_str_B + i + 1);
         flaws_str_B[i] = '\0';
     }
@@ -834 +794 @@
     if (c && strncmp(c, "/part", 5) == 0) {
         /* yup it's devfs, return the "disc" path */
-        strcpy(c + 1, "disc");
+        strncpy(c + 1, "disc", (size_t)5);
         return partition;
     }
@@ -1027 +987 @@
     /*@ int *********************************************** */
     int percentage = 0;
-    int i;
-    int j;
+    int i = 0;
+    int j = 0;
 
     /*@ buffers ******************************************* */
-    char *outstr;
-    char *tmp;
-    char *tmp1;
-    char *tmp2;
-    char *prepstr;
-    char *p;
+    char *outstr = NULL;
+    char *tmp1 = NULL;
+    char *tmp2 = NULL;
+    char *prepstr = NULL;
+    char *p = NULL;
 
     assert(bkpinfo != NULL);
 
     if (bkpinfo->media_size[g_current_media_number] <= 0) {
-        asprintf(&tmp, "%lld", g_tape_posK);
-        asprintf(&outstr, _("Volume %d: %s kilobytes archived so far"),
-                 g_current_media_number, commarize(tmp));
-        paranoid_free(tmp);
+        asprintf(&outstr, _("Volume %d: %'lld kilobytes archived so far"),
+                 g_current_media_number, g_tape_posK);
 
         return (outstr);
@@ -1060 +1017 @@
                    bkpinfo->media_size[g_current_media_number]);
         asprintf(&prepstr, "%s %d: [",
-                 media_descriptor_string(bkpinfo->backup_media_type),
+                 bkpinfo->backup_media_string,
                  g_current_media_number);
     }
@@ -1093 +1050 @@
     return (outstr);
 }
-
-/**
- * Get a string form of @p type_of_bkp.
- * @param type_of_bkp The backup type to stringify.
- * @return The stringification of @p type_of_bkp.
- * @note The returned string points to static storage that will be overwritten with each call.
- */
-char *media_descriptor_string(t_bkptype type_of_bkp)
-{
-    static char *type_of_backup = NULL;
-
-    if (!type_of_backup) {
-        malloc_string(type_of_backup);
-    }
-
-    switch (type_of_bkp) {
-    case dvd:
-        strcpy(type_of_backup, "DVD");
-        break;
-    case cdr:
-        strcpy(type_of_backup, "CDR");
-        break;
-    case cdrw:
-        strcpy(type_of_backup, "CDRW");
-        break;
-    case tape:
-        strcpy(type_of_backup, "tape");
-        break;
-    case cdstream:
-        strcpy(type_of_backup, "CDR");
-        break;
-    case udev:
-        strcpy(type_of_backup, "udev");
-        break;
-    case iso:
-        strcpy(type_of_backup, "ISO");
-        break;
-    case nfs:
-        strcpy(type_of_backup, "nfs");
-        break;
-    default:
-        strcpy(type_of_backup, "ISO");
-    }
-    return (type_of_backup);
-}