core: utils: remove str replace function from the client library

Author: joelguittet

components/mender-mcu-client/mender-mcu-client

@@ -180,6 +180,105 @@ config_updated_cb(mender_keystore_t *configuration) {
 
 #ifdef CONFIG_MENDER_CLIENT_ADD_ON_TROUBLESHOOT
 
+/**
+ * @brief Function used to replace a string in the input buffer
+ * @param input Input buffer
+ * @param search String to be replaced or regex expression
+ * @param replace Replacement string
+ * @return New string with replacements if the function succeeds, NULL otherwise
+ */
+static char *
+str_replace(char *input, char *search, char *replace) {
+
+    assert(NULL != input);
+    assert(NULL != search);
+    assert(NULL != replace);
+
+    regex_t    regex;
+    regmatch_t match;
+    char *     str                   = input;
+    char *     output                = NULL;
+    size_t     index                 = 0;
+    int        previous_match_finish = 0;
+
+    /* Compile expression */
+    if (0 != regcomp(&regex, search, REG_EXTENDED)) {
+        /* Unable to compile expression */
+        mender_log_error("Unable to compile expression '%s'", search);
+        return NULL;
+    }
+
+    /* Loop until all search string are replaced */
+    bool loop = true;
+    while (true == loop) {
+
+        /* Search wanted string */
+        if (0 != regexec(&regex, str, 1, &match, 0)) {
+            /* No more string to be replaced */
+            loop = false;
+        } else {
+            if (match.rm_so != -1) {
+
+                /* Beginning and ending offset of the match */
+                int current_match_start  = (int)(match.rm_so + (str - input));
+                int current_match_finish = (int)(match.rm_eo + (str - input));
+
+                /* Reallocate output memory */
+                char *tmp = (char *)realloc(output, index + (current_match_start - previous_match_finish) + 1);
+                if (NULL == tmp) {
+                    mender_log_error("Unable to allocate memory");
+                    regfree(&regex);
+                    free(output);
+                    return NULL;
+                }
+                output = tmp;
+
+                /* Copy string from previous match to the beginning of the current match */
+                memcpy(&output[index], &input[previous_match_finish], current_match_start - previous_match_finish);
+                index += (current_match_start - previous_match_finish);
+                output[index] = 0;
+
+                /* Reallocate output memory */
+                if (NULL == (tmp = (char *)realloc(output, index + strlen(replace) + 1))) {
+                    mender_log_error("Unable to allocate memory");
+                    regfree(&regex);
+                    free(output);
+                    return NULL;
+                }
+                output = tmp;
+
+                /* Copy replace string to the output */
+                strcat(output, replace);
+                index += strlen(replace);
+
+                /* Update previous match ending value */
+                previous_match_finish = current_match_finish;
+            }
+            str += match.rm_eo;
+        }
+    }
+
+    /* Reallocate output memory */
+    char *tmp = (char *)realloc(output, index + (strlen(input) - previous_match_finish) + 1);
+    if (NULL == tmp) {
+        mender_log_error("Unable to allocate memory");
+        regfree(&regex);
+        free(output);
+        return NULL;
+    }
+    output = tmp;
+
+    /* Copy the end of the string after the latest match */
+    memcpy(&output[index], &input[previous_match_finish], strlen(input) - previous_match_finish);
+    index += (strlen(input) - previous_match_finish);
+    output[index] = 0;
+
+    /* Release regex */
+    regfree(&regex);
+
+    return output;
+}
+
 /**
  * @brief Shell vprintf function used to route logs
  * @param format Log format string
@@ -204,7 +303,7 @@ shell_vprintf(const char *format, va_list args) {
     if (NULL == (buffer = strndup(data, length))) {
         goto END;
     }
-    if (NULL == (tmp = mender_utils_str_replace(buffer, "\r|\n", "\r\n"))) {
+    if (NULL == (tmp = str_replace(buffer, "\r|\n", "\r\n"))) {
         goto END;
     }
     buffer = tmp;
@@ -273,7 +372,7 @@ shell_write_cb(uint8_t *data, size_t length) {
         ret = MENDER_FAIL;
         goto END;
     }
-    if (NULL == (tmp = mender_utils_str_replace(buffer, "\r|\n", "\r\n"))) {
+    if (NULL == (tmp = str_replace(buffer, "\r|\n", "\r\n"))) {
         ESP_LOGE(TAG, "Unable to allocate memory");
         ret = MENDER_FAIL;
         goto END;