From 3beb9e42dcf434610625de8d3824505186a95757 Mon Sep 17 00:00:00 2001
From: Matthew Todd <matcatprg@yahoo.com>
Date: Wed, 16 Jan 2013 21:15:23 -0800
Subject: [PATCH] Replace all occurrences of markup in notification.

fix_markup previously would only replace one occurrence of needle in the
notification string. So we'd end up with some markup's making it
through, if there was more than one of a particular kind.

Introduces new function string_replace_all and calls it from fix_markup.
---
 dunst.c | 30 +++++++++++++++---------------
 utils.c | 12 ++++++++++++
 utils.h |  4 ++++
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/dunst.c b/dunst.c
index 6b4ccac..7b43dbd 100644
--- a/dunst.c
+++ b/dunst.c
@@ -874,23 +874,23 @@ char
                 return NULL;
         }
 
-        str = string_replace("&quot;", "\"", str);
-        str = string_replace("&apos;", "'", str);
-        str = string_replace("&amp;", "&", str);
-        str = string_replace("&lt;", "<", str);
-        str = string_replace("&gt;", ">", str);
+        str = string_replace_all("&quot;", "\"", str);
+        str = string_replace_all("&apos;", "'", str);
+        str = string_replace_all("&amp;", "&", str);
+        str = string_replace_all("&lt;", "<", str);
+        str = string_replace_all("&gt;", ">", str);
 
         /* remove tags */
-        str = string_replace("<b>", "", str);
-        str = string_replace("</b>", "", str);
-        str = string_replace("<br>", " ", str);
-        str = string_replace("<br/>", " ", str);
-        str = string_replace("<br />", " ", str);
-        str = string_replace("<i>", "", str);
-        str = string_replace("</i>", "", str);
-        str = string_replace("<u>", "", str);
-        str = string_replace("</u>", "", str);
-        str = string_replace("</a>", "", str);
+        str = string_replace_all("<b>", "", str);
+        str = string_replace_all("</b>", "", str);
+        str = string_replace_all("<br>", " ", str);
+        str = string_replace_all("<br/>", " ", str);
+        str = string_replace_all("<br />", " ", str);
+        str = string_replace_all("<i>", "", str);
+        str = string_replace_all("</i>", "", str);
+        str = string_replace_all("<u>", "", str);
+        str = string_replace_all("</u>", "", str);
+        str = string_replace_all("</a>", "", str);
 
         start = strstr(str, "<a href");
         if (start != NULL) {
diff --git a/utils.c b/utils.c
index d759602..910328d 100644
--- a/utils.c
+++ b/utils.c
@@ -25,6 +25,18 @@ char *lskip(char *s)
         return s;
 }
 
+char *string_replace_all(const char *needle, const char *replacement,
+                         char *haystack)
+{
+        char *start;
+        start = strstr(haystack, needle);
+        while(start != NULL) {
+                haystack = string_replace(needle, replacement, haystack);
+                start = strstr(haystack, needle);
+        }
+        return haystack;
+}
+
 char *string_replace(const char *needle, const char *replacement,
                      char *haystack)
 {
diff --git a/utils.h b/utils.h
index 25bd62f..9b99353 100644
--- a/utils.h
+++ b/utils.h
@@ -4,6 +4,10 @@
 char *rstrip(char *str);
 char *lskip(char *str);
 
+/* replace all occurrences of needle with replacement in haystack */
+char *string_replace_all(const char *needle, const char *replacement,
+                         char *haystack);
+
 /* replace needle with replacement in haystack */
 char *string_replace(const char *needle, const char *replacement,
                      char *haystack);