Changeset 3641 in MondoRescue

Timestamp:

Dec 24, 2016, 12:56:11 AM (7 years ago)

Author:

Bruno Cornec

Message:

• Finalize fix for #644 by removing the last MAX_STR_LEN usage in the function running commands. Everything on the exclude line should now be handle dynamically.

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-fork.c (modified) (2 diffs)
• lib/mr_str.c (modified) (2 diffs)

branches/3.3/mondo/src/common/libmondo-fork.c

@@ -253 +253 @@
     /*@ buffer ****************************************************** */
     char *callstr = NULL;
-    char incoming[MAX_STR_LEN * 2];
+    char *incoming = NULL;
     char *tmp1 = NULL;
+    char *tmp2 = NULL;
 
     /*@ int ********************************************************* */
@@ -307 +308 @@
     fin = fopen(tmp1, "r");
     if (fin) {
-        for (q = fgets(incoming, MAX_STR_LEN, fin); !feof(fin) && (q != NULL); q = fgets(incoming, MAX_STR_LEN, fin)) {
-            p = incoming;
-            while (p && *p) {
-                if ((p = strchr(p, '%'))) {
-                    memmove(p, p + 1, strlen(p) + 1);
-                    p += 2;
-                }
-            }
-            strip_spaces(incoming);
+        for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
+            // Removes % char
+            tmp2 = mr_stresc(incoming, "%", '\\', '\'');
+            mr_free(incoming);
+            incoming = tmp2;
+
+            // Remove spaces
+            tmp2 = mr_strip_spaces(incoming);
+            mr_free(incoming);
+            incoming = tmp2;
             if ((res == 0 && log_if_success) || (res != 0 && log_if_failure)) {
                 log_msg(0, incoming);
             }
+            mr_free(incoming);
         }
         paranoid_fclose(fin);

branches/3.3/mondo/src/lib/mr_str.c

@@ -193 +193 @@
 }
 
+/*  Subsitute the string token in the string in by the string subst */
 char *mr_str_substitute(const char *in, const char *token, const char *subst) {
 
@@ -205 +206 @@
     return(output);
 }
-// token found end string here for now
+// token found: end string here for now
 *tmp = '\0';