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

Timestamp:

Sep 25, 2013, 9:03:25 AM (11 years ago)

Author:

Bruno Cornec

Message:

• revert r3188 & r3189 as I started to work on branch 3.0 before deciding it was much better to do it in 3.2. This will allow some small maintenance work on 3.0 if needed, while pushing all the rest to 3.2 and providing early access to it.

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;
@@ -66 +65 @@
     }
     sprintf(p, "%d", partno);
-    return(partition);
-}
+    return (partition);
+}
+
+
+
+
+
+
+
+
+
+
+
 
 
@@ -108 +118 @@
 
 
+
+
+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.
@@ -129 +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);
     }
@@ -142 +170 @@
     return (output);
 }
+
+
+
+
+
+
+
 
 
@@ -182 +217 @@
     long outval;
     int i;
-    char *tmp = NULL;
+    char *tmp;
     char ch;
 
@@ -193 +228 @@
         fatal_error("Please use integers only. No decimal points.");
     }
-
-    mr_asprintf(tmp, "%s", incoming);
+    malloc_string(tmp);
+    strcpy(tmp, incoming);
     i = (int) strlen(tmp);
     if (tmp[i - 1] == 'B' || tmp[i - 1] == 'b') {
@@ -203 +238 @@
     tmp[i] = '\0';
     outval = atol(tmp);
-    mr_free(tmp);
-
     if (ch == 'g' || ch == 'G') {
         outval = outval * 1024;
@@ -220 +253 @@
         fatal_error("Integer overflow.");
     } else if (ch != 'm' && ch != 'M') {
-        mr_asprintf(tmp, "Re: parameter '%s' - bad multiplier ('%c')", incoming, ch);
+        sprintf(tmp, "Re: parameter '%s' - bad multiplier ('%c')",
+                incoming, ch);
         fatal_error(tmp);
     }
+    paranoid_free(tmp);
     return (outval);
 }
@@ -481 +516 @@
 
     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);
 
@@ -519 +557 @@
     /*@ buffers **************************************************** */
     static char output[MAX_STR_LEN];
-    char *suffix = NULL;
+    static char suffix[MAX_STR_LEN];
 
     /*@ end vars *************************************************** */
@@ -525 +563 @@
     assert_string_is_neither_NULL_nor_zerolength(path);
     if (s[0] != '\0') {
-        mr_asprintf(suffix, ".%s", s);
+        sprintf(suffix, ".%s", s);
     } else {
-        mr_asprintf(suffix, "");
-    }
-    sprintf(output, "%s/slice-%07ld.%05ld.dat%s", path, bigfileno, sliceno, suffix);
-    mr_free(suffix);
+        suffix[0] = '\0';
+    }
+    sprintf(output, "%s/slice-%07ld.%05ld.dat%s", path, bigfileno, sliceno,
+            suffix);
     return (output);
 }
@@ -608 +646 @@
     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));
 }
@@ -733 +775 @@
     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';} */
 }
 
@@ -866 +909 @@
  * @return The severity (1-3).
  */
-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?
+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?
     assert_string_is_neither_NULL_nor_zerolength(fn);
     if (!strncmp(fn, MNT_RESTORING, strlen(MNT_RESTORING))) {
-        mr_asprintf(filename, "%s", fn + strlen(MNT_RESTORING));
+        strcpy(filename, fn + strlen(MNT_RESTORING));
     } else if (fn[0] != '/') {
-        mr_asprintf(filename, "/%s", fn);
+        sprintf(filename, "/%s", fn);
     } else {
-        mr_asprintf(filename, "%s", fn);
-    }
-
-    mr_asprintf(reason, "Changed since backup. Consider running a differential backup in a day or two.");
-
+        strcpy(filename, fn);
+    }
+
+    sev = 3;
+    sprintf(reason,
+            "Changed since backup. Consider running a differential backup in a day or two.");
     if (!strncmp(filename, "/var/", 5)) {
         sev = 2;
-        mr_free(reason);
-        mr_asprintf(reason, "/var's contents will change regularly, inevitably.");
+        sprintf(reason,
+                "/var's contents will change regularly, inevitably.");
     }
     if (!strncmp(filename, "/home", 5)) {
         sev = 2;
-        mr_free(reason);
-        mr_asprintf(reason, "It's in your /home directory. Therefore, it is important.");
+        sprintf(reason,
+                "It's in your /home directory. Therefore, it is important.");
     }
     if (!strncmp(filename, "/usr/", 5)) {
         sev = 3;
-        mr_free(reason);
-        mr_asprintf(reason, "You may have installed/removed software during the backup.");
+        sprintf(reason,
+                "You may have installed/removed software during the backup.");
     }
     if (!strncmp(filename, "/etc/", 5)) {
         sev = 3;
-        mr_free(reason);
-        mr_asprintf(reason, "Do not edit config files while backing up your PC.");
+        sprintf(reason,
+                "Do not edit config files while backing up your PC.");
     }
     if (!strcmp(filename, "/etc/adjtime")
         || !strcmp(filename, "/etc/mtab")) {
         sev = 1;
-        mr_free(reason);
-        mr_asprintf(reason, "This file changes all the time. It's OK.");
+        sprintf(reason, "This file changes all the time. It's OK.");
     }
     if (!strncmp(filename, "/root/", 6)) {
         sev = 3;
-        mr_free(reason);
-        mr_asprintf(reason, "Were you compiling/editing something in /root?");
+        sprintf(reason, "Were you compiling/editing something in /root?");
     }
     if (!strncmp(filename, "/root/.", 7)) {
         sev = 2;
-        mr_free(reason);
-        mr_asprintf(reason, "Temp or 'dot' files changed in /root.");
+        sprintf(reason, "Temp or 'dot' files changed in /root.");
     }
     if (!strncmp(filename, "/var/lib/", 9)) {
         sev = 2;
-        mr_free(reason);
-        mr_asprintf(reason, "Did you add/remove software during backing?");
+        sprintf(reason, "Did you add/remove software during backing?");
     }
     if (!strncmp(filename, "/var/lib/rpm", 12)) {
         sev = 3;
-        mr_free(reason);
-        mr_asprintf(reason, "Did you add/remove software during backing?");
+        sprintf(reason, "Did you add/remove software during backing?");
     }
     if (!strncmp(filename, "/var/lib/slocate", 16)) {
         sev = 1;
-        mr_free(reason);
-        mr_asprintf(reason, "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
+        sprintf(reason,
+                "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
     }
     if (!strncmp(filename, "/var/log/", 9)
@@ -939 +980 @@
         || !strcmp(filename + strlen(filename) - 4, ".log")) {
         sev = 1;
-        mr_free(reason);
-        mr_asprintf(reason, "Log files change frequently as the computer runs. Fret not.");
+        sprintf(reason,
+                "Log files change frequently as the computer runs. Fret not.");
     }
     if (!strncmp(filename, "/var/spool", 10)) {
         sev = 1;
-        mr_free(reason);
-        mr_asprintf(reason, "Background processes or printers were active. This does not affect the integrity of your backup.");
+        sprintf(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;
-        mr_free(reason);
-        mr_asprintf(reason, "Mail was sent/received during backup.");
+        sprintf(reason, "Mail was sent/received during backup.");
     }
     if (filename[strlen(filename) - 1] == '~') {
         sev = 1;
-        mr_free(reason);
-        mr_asprintf(reason, "Backup copy of another file which was modified recently.");
+        sprintf(reason,
+                "Backup copy of another file which was modified recently.");
     }
     if (strstr(filename, "cache")) {
         sev = 1;
-        mr_free(reason);
-        mr_asprintf(reason, "Part of a cache of data. Caches change from time to time. Don't worry.");
+        sprintf(reason,
+                "Part of a cache of data. Caches change from time to time. Don't worry.");
     }
     if (!strncmp(filename, "/var/run/", 9)
@@ -967 +1007 @@
         || strstr(filename, "/.Xauthority")) {
         sev = 1;
-        mr_free(reason);
-        mr_asprintf(reason, "Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence.");
+        sprintf(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);
     }
-    mr_free(filename);
-    mr_free(reason);
+    paranoid_free(filename);
+    paranoid_free(reason);
     return (sev);
 }
@@ -1024 +1064 @@
     /*@ buffers ******************************************* */
     static char outstr[MAX_STR_LEN];
-    char *pos_w_commas = NULL;
+    char *pos_w_commas, *tmp;
     char *mds = NULL;
-    char *tmp = NULL;
 
     assert(bkpinfo != NULL);
-
-    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);
+    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);
         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);
@@ -1047 +1091 @@
         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);
@@ -1060 +1105 @@
     j = (int) strlen(outstr);
     sprintf(outstr + j, "] %d%% used", percentage);
+    paranoid_free(pos_w_commas);
+    paranoid_free(tmp);
     return (outstr);
 }