Changeset 3188 in MondoRescue for branches/3.0/mondo/src/common/libmondo-string.c

Timestamp:

Sep 25, 2013, 8:55:39 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Backport tons of dynamic memory management rewrite from 3.1 branch. Test is needed

File:

• branches/3.0/mondo/src/common/libmondo-string.c (modified) (20 diffs)

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

@@ -51 +51 @@
     if (c && strncmp(c, "/disc", 5) == 0) {
         /* yup it's devfs, return the "part" path */
+        /* This strcpy is safe */
         strcpy(c + 1, "part");
         p = c + 5;
@@ -65 +66 @@
     }
     sprintf(p, "%d", partno);
-    return (partition);
-}
-
-
-
-
-
-
-
-
-
-
-
+    return(partition);
+}
 
 
@@ -118 +108 @@
 
 
-
-
-inline void turn_wildcard_chars_into_literal_chars(char *sout, char *sin)
-{
-    char *p, *q;
-
-    for (p = sin, q = sout; *p != '\0'; *(q++) = *(p++)) {
-        if (strchr("[]*?", *p)) {
-            *(q++) = '\\';
-        }
-    }
-    *q = *p;                    // for the final '\0'
-}
-
-
-
 /**
  * Add commas every third place in @p input.
@@ -155 +129 @@
         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);
     }
@@ -170 +142 @@
     return (output);
 }
-
-
-
-
-
-
-
 
 
@@ -217 +182 @@
     long outval;
     int i;
-    char *tmp;
+    char *tmp = NULL;
     char ch;
 
@@ -228 +193 @@
         fatal_error("Please use integers only. No decimal points.");
     }
-    malloc_string(tmp);
-    strcpy(tmp, incoming);
+
+    mr_asprintf(tmp, "%s", incoming);
     i = (int) strlen(tmp);
     if (tmp[i - 1] == 'B' || tmp[i - 1] == 'b') {
@@ -238 +203 @@
     tmp[i] = '\0';
     outval = atol(tmp);
+    mr_free(tmp);
+
     if (ch == 'g' || ch == 'G') {
         outval = outval * 1024;
@@ -253 +220 @@
         fatal_error("Integer overflow.");
     } else if (ch != 'm' && ch != 'M') {
-        sprintf(tmp, "Re: parameter '%s' - bad multiplier ('%c')",
-                incoming, ch);
+        mr_asprintf(tmp, "Re: parameter '%s' - bad multiplier ('%c')", incoming, ch);
         fatal_error(tmp);
     }
-    paranoid_free(tmp);
     return (outval);
 }
@@ -516 +481 @@
 
     input = malloc(2000);
-    // BERLIOS: seems to cause invalid errors 
-    //assert_string_is_neither_NULL_nor_zerolength(ip);
-    assert_string_is_neither_NULL_nor_zerolength(token);
     assert(value != NULL);
 
@@ -557 +519 @@
     /*@ buffers **************************************************** */
     static char output[MAX_STR_LEN];
-    static char suffix[MAX_STR_LEN];
+    char *suffix = NULL;
 
     /*@ end vars *************************************************** */
@@ -563 +525 @@
     assert_string_is_neither_NULL_nor_zerolength(path);
     if (s[0] != '\0') {
-        sprintf(suffix, ".%s", s);
+        mr_asprintf(suffix, ".%s", s);
     } else {
-        suffix[0] = '\0';
-    }
-    sprintf(output, "%s/slice-%07ld.%05ld.dat%s", path, bigfileno, sliceno,
-            suffix);
+        mr_asprintf(suffix, "");
+    }
+    sprintf(output, "%s/slice-%07ld.%05ld.dat%s", path, bigfileno, sliceno, suffix);
+    mr_free(suffix);
     return (output);
 }
@@ -646 +608 @@
     numA = atol(stringA + start_of_numbers_in_A);
     numB = atol(stringB + start_of_numbers_in_B);
-    /*
-       sprintf(tmp,"Comparing %s and %s --> %ld,%ld\n",stringA,stringB,numA,numB);
-       log_to_screen(tmp);
-     */
     return ((int) (numA - numB));
 }
@@ -775 +733 @@
     in_out[i] = '\0';
     paranoid_free(tmp);
-/*  for(i=strlen(in_out); i>0 && in_out[i-1]<=32; i--) {in_out[i-1]='\0';} */
 }
 
@@ -909 +866 @@
  * @return The severity (1-3).
  */
-int severity_of_difference(char *fn, char *out_reason)
-{
-    int sev;
-    char *reason;
-    char *filename;
-
-    malloc_string(reason);
-    malloc_string(filename);
-// out_reason might be null on purpose, so don't bomb if it is :) OK?
+int severity_of_difference(char *fn, char *out_reason) {
+
+    int sev = 3;
+    char *reason = NULL;
+    char *filename = NULL;
+
+    // out_reason might be null on purpose, so don't bomb if it is :) OK?
     assert_string_is_neither_NULL_nor_zerolength(fn);
     if (!strncmp(fn, MNT_RESTORING, strlen(MNT_RESTORING))) {
-        strcpy(filename, fn + strlen(MNT_RESTORING));
+        mr_asprintf(filename, "%s", fn + strlen(MNT_RESTORING));
     } else if (fn[0] != '/') {
-        sprintf(filename, "/%s", fn);
+        mr_asprintf(filename, "/%s", fn);
     } else {
-        strcpy(filename, fn);
-    }
-
-    sev = 3;
-    sprintf(reason,
-            "Changed since backup. Consider running a differential backup in a day or two.");
+        mr_asprintf(filename, "%s", fn);
+    }
+
+    mr_asprintf(reason, "Changed since backup. Consider running a differential backup in a day or two.");
+
     if (!strncmp(filename, "/var/", 5)) {
         sev = 2;
-        sprintf(reason,
-                "/var's contents will change regularly, inevitably.");
+        mr_free(reason);
+        mr_asprintf(reason, "/var's contents will change regularly, inevitably.");
     }
     if (!strncmp(filename, "/home", 5)) {
         sev = 2;
-        sprintf(reason,
-                "It's in your /home directory. Therefore, it is important.");
+        mr_free(reason);
+        mr_asprintf(reason, "It's in your /home directory. Therefore, it is important.");
     }
     if (!strncmp(filename, "/usr/", 5)) {
         sev = 3;
-        sprintf(reason,
-                "You may have installed/removed software during the backup.");
+        mr_free(reason);
+        mr_asprintf(reason, "You may have installed/removed software during the backup.");
     }
     if (!strncmp(filename, "/etc/", 5)) {
         sev = 3;
-        sprintf(reason,
-                "Do not edit config files while backing up your PC.");
+        mr_free(reason);
+        mr_asprintf(reason, "Do not edit config files while backing up your PC.");
     }
     if (!strcmp(filename, "/etc/adjtime")
         || !strcmp(filename, "/etc/mtab")) {
         sev = 1;
-        sprintf(reason, "This file changes all the time. It's OK.");
+        mr_free(reason);
+        mr_asprintf(reason, "This file changes all the time. It's OK.");
     }
     if (!strncmp(filename, "/root/", 6)) {
         sev = 3;
-        sprintf(reason, "Were you compiling/editing something in /root?");
+        mr_free(reason);
+        mr_asprintf(reason, "Were you compiling/editing something in /root?");
     }
     if (!strncmp(filename, "/root/.", 7)) {
         sev = 2;
-        sprintf(reason, "Temp or 'dot' files changed in /root.");
+        mr_free(reason);
+        mr_asprintf(reason, "Temp or 'dot' files changed in /root.");
     }
     if (!strncmp(filename, "/var/lib/", 9)) {
         sev = 2;
-        sprintf(reason, "Did you add/remove software during backing?");
+        mr_free(reason);
+        mr_asprintf(reason, "Did you add/remove software during backing?");
     }
     if (!strncmp(filename, "/var/lib/rpm", 12)) {
         sev = 3;
-        sprintf(reason, "Did you add/remove software during backing?");
+        mr_free(reason);
+        mr_asprintf(reason, "Did you add/remove software during backing?");
     }
     if (!strncmp(filename, "/var/lib/slocate", 16)) {
         sev = 1;
-        sprintf(reason,
-                "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
+        mr_free(reason);
+        mr_asprintf(reason, "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
     }
     if (!strncmp(filename, "/var/log/", 9)
@@ -980 +939 @@
         || !strcmp(filename + strlen(filename) - 4, ".log")) {
         sev = 1;
-        sprintf(reason,
-                "Log files change frequently as the computer runs. Fret not.");
+        mr_free(reason);
+        mr_asprintf(reason, "Log files change frequently as the computer runs. Fret not.");
     }
     if (!strncmp(filename, "/var/spool", 10)) {
         sev = 1;
-        sprintf(reason,
-                "Background processes or printers were active. This does not affect the integrity of your backup.");
+        mr_free(reason);
+        mr_asprintf(reason, "Background processes or printers were active. This does not affect the integrity of your backup.");
     }
     if (!strncmp(filename, "/var/spool/mail", 10)) {
         sev = 2;
-        sprintf(reason, "Mail was sent/received during backup.");
+        mr_free(reason);
+        mr_asprintf(reason, "Mail was sent/received during backup.");
     }
     if (filename[strlen(filename) - 1] == '~') {
         sev = 1;
-        sprintf(reason,
-                "Backup copy of another file which was modified recently.");
+        mr_free(reason);
+        mr_asprintf(reason, "Backup copy of another file which was modified recently.");
     }
     if (strstr(filename, "cache")) {
         sev = 1;
-        sprintf(reason,
-                "Part of a cache of data. Caches change from time to time. Don't worry.");
+        mr_free(reason);
+        mr_asprintf(reason, "Part of a cache of data. Caches change from time to time. Don't worry.");
     }
     if (!strncmp(filename, "/var/run/", 9)
@@ -1007 +967 @@
         || strstr(filename, "/.Xauthority")) {
         sev = 1;
-        sprintf(reason,
-                "Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence.");
+        mr_free(reason);
+        mr_asprintf(reason, "Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence.");
     }
     if (out_reason) {
         strcpy(out_reason, reason);
     }
-    paranoid_free(filename);
-    paranoid_free(reason);
+    mr_free(filename);
+    mr_free(reason);
     return (sev);
 }
@@ -1064 +1024 @@
     /*@ buffers ******************************************* */
     static char outstr[MAX_STR_LEN];
-    char *pos_w_commas, *tmp;
+    char *pos_w_commas = NULL;
     char *mds = NULL;
+    char *tmp = 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 <= 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 <= 0) {
+        mr_asprintf(tmp, "%lld", g_tape_posK);
+        mr_asprintf(pos_w_commas, "%s", commarize(tmp));
+        mr_free(tmp);
+        sprintf(outstr, "Volume %d: %s kilobytes archived so far", g_current_media_number, pos_w_commas);
+        mr_free(pos_w_commas);
         return (outstr);
     }
 
-/* update screen */
+    /* update screen */
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         percentage = (int) (g_tape_posK / 10 / bkpinfo->media_size);
@@ -1091 +1047 @@
         sprintf(outstr, "Volume %d: [", g_current_media_number);
     } else {
-        percentage =
-            (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 / bkpinfo->media_size);
+        percentage = (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 / bkpinfo->media_size);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
         sprintf(outstr, "%s %d: [", mds, g_current_media_number);
@@ -1105 +1060 @@
     j = (int) strlen(outstr);
     sprintf(outstr + j, "] %d%% used", percentage);
-    paranoid_free(pos_w_commas);
-    paranoid_free(tmp);
     return (outstr);
 }