X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Futils_subst.c;h=2f28eb9b141fabbdaf452b227727dfa3f1b40bd5;hb=633c3966f770e4d46651a2fe219a18d8a9907a9f;hp=05dc8441c8f965a088134132411c27bac4c180c5;hpb=97fe230249ff8bf6aa71acfa206443c4a7238ab7;p=collectd.git

diff --git a/src/utils_subst.c b/src/utils_subst.c
index 05dc8441..2f28eb9b 100644
--- a/src/utils_subst.c
+++ b/src/utils_subst.c
@@ -1,19 +1,24 @@
 /**
  * collectd - src/utils_subst.c
- * Copyright (C) 2008  Sebastian Harl
+ * Copyright (C) 2008       Sebastian Harl
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; only version 2 of the License is applicable.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  * Authors:
  *   Sebastian "tokkee" Harl <sh at tokkee.org>
@@ -37,7 +42,8 @@ char *subst (char *buf, size_t buflen, const char *string, int off1, int off2,
 			|| (NULL == replacement))
 		return NULL;
 
-	sstrncpy (buf_ptr, string, (off1 + 1 > buflen) ? buflen : off1 + 1);
+	sstrncpy (buf_ptr, string,
+			((size_t)off1 + 1 > buflen) ? buflen : (size_t)off1 + 1);
 	buf_ptr += off1;
 	len     -= off1;
 
@@ -78,5 +84,66 @@ char *asubst (const char *string, int off1, int off2, const char *replacement)
 	return ret;
 } /* asubst */
 
+char *subst_string (char *buf, size_t buflen, const char *string,
+		const char *needle, const char *replacement)
+{
+	char *temp;
+	size_t needle_len;
+	size_t i;
+
+	if ((buf == NULL) || (string == NULL)
+			|| (needle == NULL) || (replacement == NULL))
+		return (NULL);
+
+	temp = (char *) malloc (buflen);
+	if (temp == NULL)
+	{
+		ERROR ("subst_string: malloc failed.");
+		return (NULL);
+	}
+
+	needle_len = strlen (needle);
+	strncpy (buf, string, buflen);
+
+	/* Limit the loop to prevent endless loops. */
+	for (i = 0; i < buflen; i++)
+	{
+		char *begin_ptr;
+		size_t begin;
+
+		/* Find `needle' in `buf'. */
+		begin_ptr = strstr (buf, needle);
+		if (begin_ptr == NULL)
+			break;
+
+		/* Calculate the start offset. */
+		begin = begin_ptr - buf;
+
+		/* Substitute the region using `subst'. The result is stored in
+		 * `temp'. */
+		begin_ptr = subst (temp, buflen, buf,
+				begin, begin + needle_len,
+				replacement);
+		if (begin_ptr == NULL)
+		{
+			WARNING ("subst_string: subst failed.");
+			break;
+		}
+
+		/* Copy the new string in `temp' to `buf' for the next round. */
+		strncpy (buf, temp, buflen);
+	}
+
+	if (i >= buflen)
+	{
+		WARNING ("subst_string: Loop exited after %zu iterations: "
+				"string = %s; needle = %s; replacement = %s;",
+				i, string, needle, replacement);
+	}
+
+	sfree (temp);
+	return (buf);
+} /* char *subst_string */
+
 /* vim: set sw=4 ts=4 tw=78 noexpandtab : */