catch possible LF's in button text

diff --git a/msgbox.c b/msgbox.c
index 1470461d408e4d201cbed8033acdae0fc0ffba78..d53a08f2646dbdddb9b6837adbd9a041571e2d87 100644 (file)
--- a/msgbox.c
+++ b/msgbox.c
@@ -10,7 +10,7 @@
 #include "gfx.h"
 #include "txtform.h" 
 
-#define M_VERSION 1.26
+#define M_VERSION 1.27
 
 #define NCF_FILE       "/var/tuxbox/config/neutrino.conf"
 #define HDF_FILE       "/tmp/.msgbox_hidden"
@@ -203,6 +203,7 @@ char *pt1=strdup(sptr),*pt2=NULL,*pt3=NULL;
                        char *t = (char *)alloca(l * 4 + 1);
                        memcpy(t, pt2, l + 1);
                        TranslateString(t, l * 4);
+                       CatchLF(t);
                        butmsg[btn]=strdup(t);
                        CatchTabs(butmsg[btn++]);
                }

diff --git a/text.c b/text.c
index ab8df36baece962b075662ff90abbb1644c4b4ee..8f8a2293fcf138c53970364fe8dca9b6a8f8cc10 100644 (file)
--- a/text.c
+++ b/text.c
@@ -354,6 +354,17 @@ int GetStringLen(int _sx, char *string, size_t size)
        return stringlen;
 }
 
+void CatchLF(char *text)
+{
+char *src, *dst;
+       for (src = dst = text; *src != '\0'; src++)
+       {
+               *dst = *src;
+               if (*dst != 0x0A) dst++;
+       }
+       *dst = '\0';
+}
+
 void CatchTabs(char *text)
 {
        int i;

diff --git a/text.h b/text.h
index 592f9675fe7f1a4aab4374c61bdf176f6adde06c..d414354c5d6b10a0e403e1f63d1a8fcb3fe3202f 100644 (file)
--- a/text.h
+++ b/text.h
@@ -8,5 +8,6 @@ int RenderString(char *string, int sx, int sy, int maxwidth, int layout, int siz
 void TranslateString(char *src, size_t size);
 int GetStringLen(int sx, char *string, size_t size);
 void CatchTabs(char *text);
+void CatchLF(char *text);
 
 #endif