Patch for open-vm-tools-10.0.0-3000743

open-vm-tools/lib/include/strutil.h

@@ -69,4 +69,6 @@ void StrUtil_SafeStrcatF(char **prefix, const char *fmt, ...) PRINTF_DECL(2, 3);
 
 char *StrUtil_TrimWhitespace(const char *str);
 
+char *StrUtil_ReplaceAll(const char *orig, const char *what, const char *with);
+
 #endif /* STRUTIL_H */

open-vm-tools/lib/misc/strutil.c

@@ -37,6 +37,30 @@
 #include "util.h"
 
 
+/*
+ *-----------------------------------------------------------------------------
+ *
+ * StrUtil_IsEmpty --
+ *
+ *      Test if a non-NULL string is empty.
+ *
+ * Results:
+ *      TRUE if the string has length 0, FALSE otherwise.
+ *
+ * Side effects:
+ *      None
+ *
+ *-----------------------------------------------------------------------------
+ */
+
+static INLINE Bool
+StrUtil_IsEmpty(const char *str)  // IN:
+{
+   ASSERT(str != NULL);
+   return str[0] == '\0';
+}
+
+
 /*
  *-----------------------------------------------------------------------------
  *
@@ -1235,3 +1259,66 @@ StrUtil_TrimWhitespace(const char *str)  // IN
 
    return res;
 }
+
+
+/*
+ *-----------------------------------------------------------------------------
+ *
+ * StrUtil_ReplaceAll --
+ *
+ *    Replaces all occurrences of a non-empty substring with non-NULL pattern
+ *    in non-NULL string.
+ *
+ * Results:
+ *    Returns pointer to the allocated resulting string. The caller is
+ *    responsible for freeing it.
+ *
+ *-----------------------------------------------------------------------------
+ */
+
+char *
+StrUtil_ReplaceAll(const char *orig, // IN
+                   const char *what, // IN
+                   const char *with) // IN
+{
+    char *result;
+    const char *current;
+    char *tmp;
+    size_t lenWhat;
+    size_t lenWith;
+    size_t lenBefore;
+    size_t occurrences = 0;
+    size_t lenNew;
+
+    ASSERT(orig != NULL);
+    ASSERT(!StrUtil_IsEmpty(what));
+    ASSERT(with != NULL);
+
+    lenWhat = strlen(what);
+    lenWith = strlen(with);
+
+    current = orig;
+    while ((tmp = strstr(current, what)) != NULL) {
+       current = tmp + lenWhat;
+       ++occurrences;
+    }
+
+    lenNew = strlen(orig) + (lenWith - lenWhat) * occurrences;
+    tmp = Util_SafeMalloc(lenNew + 1);
+    result = tmp;
+
+    while (occurrences--) {
+       current = strstr(orig, what);
+       lenBefore = current - orig;
+       tmp = memcpy(tmp, orig, lenBefore);
+       tmp += lenBefore;
+       tmp = memcpy(tmp, with, lenWith);
+       tmp += lenWith;
+       orig += lenBefore + lenWhat;
+    }
+    memcpy(tmp, orig, strlen(orig));
+
+    result[lenNew] = '\0';
+
+    return result;
+}