merged patches from...

merged patches from https://sourceforge.net/tracker/?func=detail&atid=478072&aid=2947822&group_id=55736

src/g_bang.c

@@ -587,8 +587,8 @@ static void bng_properties(t_gobj *z, t_glist *owner)
             ----------dimensions(pix):----------- %d %d size: 0 0 empty \
             --------flash-time(ms)(ms):--------- %d intrrpt: %d hold: %d \
             %d empty empty %d %d empty %d \
-            %s %s \
-            %s %d %d \
+            {%s} {%s} \
+            {%s} %d %d \
             %d %d \
             %d %d %d\n",
             x->x_gui.x_w, IEM_GUI_MINSIZE,

src/g_hdial.c

@@ -600,8 +600,8 @@ static void hradio_properties(t_gobj *z, t_glist *owner)
             ----------dimensions(pix):----------- %d %d size: 0 0 empty \
             empty 0.0 empty 0.0 empty %d \
             %d new-only new&old %d %d number: %d \
-            %s %s \
-            %s %d %d \
+            {%s} {%s} \
+            {%s} %d %d \
             %d %d \
             %d %d %d\n",
             x->x_gui.x_w, IEM_GUI_MINSIZE,

src/g_hslider.c

@@ -630,8 +630,8 @@ static void hslider_properties(t_gobj *z, t_glist *owner)
             --------dimensions(pix)(pix):-------- %d %d width: %d %d height: \
             -----------output-range:----------- %g left: %g right: %g \
             %d lin log %d %d empty %d \
-            %s %s \
-            %s %d %d \
+            {%s} {%s} \
+            {%s} %d %d \
             %d %d \
             %d %d %d\n",
             x->x_gui.x_w, IEM_SL_MINSIZE, x->x_gui.x_h, IEM_GUI_MINSIZE,

src/g_mycanvas.c

@@ -460,8 +460,8 @@ static void my_canvas_properties(t_gobj *z, t_glist *owner)
             ------selectable_dimensions(pix):------ %d %d size: 0.0 0.0 empty \
             ------visible_rectangle(pix)(pix):------ %d width: %d height: %d \
             %d empty empty %d %d empty %d \
-            %s %s \
-            %s %d %d \
+            {%s} {%s} \
+            {%s} %d %d \
             %d %d \
             %d %d %d\n",
             x->x_gui.x_w, 1,

src/g_numbox.c

@@ -845,8 +845,8 @@ static void my_numbox_properties(t_gobj *z, t_glist *owner)
             -------dimensions(digits)(pix):------- %d %d width: %d %d height: \
             -----------output-range:----------- %g min: %g max: %d \
             %d lin log %d %d log-height: %d \
-            %s %s \
-            %s %d %d \
+            {%s} {%s} \
+            {%s} %d %d \
             %d %d \
             %d %d %d\n",
             x->x_gui.x_w, 1, x->x_gui.x_h, 8,

src/g_toggle.c

@@ -587,8 +587,8 @@ static void toggle_properties(t_gobj *z, t_glist *owner)
             ----------dimensions(pix):----------- %d %d size: 0 0 empty \
             -----------non-zero-value:----------- %g value: 0.0 empty %g \
             -1 lin log %d %d empty %d \
-            %s %s \
-            %s %d %d \
+            {%s} {%s} \
+            {%s} %d %d \
             %d %d \
             %d %d %d\n",
             x->x_gui.x_w, IEM_GUI_MINSIZE,

src/g_vdial.c

@@ -602,8 +602,8 @@ static void vradio_properties(t_gobj *z, t_glist *owner)
             ----------dimensions(pix):----------- %d %d size: 0 0 empty \
             empty 0.0 empty 0.0 empty %d \
             %d new-only new&old %d %d number: %d \
-            %s %s \
-            %s %d %d \
+            {%s} {%s} \
+            {%s} %d %d \
             %d %d \
             %d %d %d\n",
             x->x_gui.x_w, IEM_GUI_MINSIZE,

src/g_vslider.c

@@ -641,8 +641,8 @@ static void vslider_properties(t_gobj *z, t_glist *owner)
             --------dimensions(pix)(pix):-------- %d %d width: %d %d height: \
             -----------output-range:----------- %g bottom: %g top: %d \
             %d lin log %d %d empty %d \
-            %s %s \
-            %s %d %d \
+            {%s} {%s} \
+            {%s} %d %d \
             %d %d \
             %d %d %d\n",
             x->x_gui.x_w, IEM_GUI_MINSIZE, x->x_gui.x_h, IEM_SL_MINSIZE,

src/g_vumeter.c

@@ -861,8 +861,8 @@ static void vu_properties(t_gobj *z, t_glist *owner)
             --------dimensions(pix)(pix):-------- %d %d width: %d %d height: \
             empty 0.0 empty 0.0 empty %d \
             %d no_scale scale %d %d empty %d \
-            %s %s \
-            %s %d %d \
+            {%s} {%s} \
+            {%s} %d %d \
             %d %d \
             %d %d %d\n",
             x->x_gui.x_w, IEM_GUI_MINSIZE, x->x_gui.x_h, IEM_VU_STEPS*IEM_VU_MINSIZE,

src/m_binbuf.c

@@ -21,6 +21,29 @@
 #include <string.h>
 #include <stdarg.h>
 
+/* escape characters for saving */
+static char* strnescape(char *dest, const char *src, size_t outlen)
+{
+    int ptin = 0;
+    unsigned ptout = 0;
+    for(; ptout < outlen; ptin++, ptout++)
+    {
+        int c = src[ptin];
+        if (c == ' ' || c=='\t')
+            dest[ptout++] = '\\';
+        dest[ptout] = src[ptin];
+        if (c==0) break;
+    }
+
+    if(ptout < outlen)
+        dest[ptout]=0;
+    else
+        dest[outlen-1]=0;
+
+    return dest;
+}
+
+
 struct _binbuf
 {
     int b_n;
@@ -1000,7 +1023,9 @@ int binbuf_write(t_binbuf *x, char *filename, char *dir, int crflag)
             bp > sbuf && bp[-1] == ' ') bp--;
         if (!crflag || ap->a_type != A_SEMI)
         {
-            atom_string(ap, bp, (ep-bp)-2);
+            char bp2[WBUFSIZE];
+            atom_string(ap, bp2, WBUFSIZE);
+            strnescape(bp, bp2, (ep-bp)-2);
             length = strlen(bp);
             bp += length;
             ncolumn += length;