Work around non-compliant sprintf().

Rockbox's sprintf() lacks the ability to left-justify a string. Fixed
by adding a copy_left_justfied() function to misc.c.

This is a new version of this commit, as the previous version broke
saving!

diff --git a/midend.c b/midend.c
index c8250ab63fbeb04d3fa7a96bba4a43a31bc13da4..2eb5ee93e8f3b00667ad3af84f51a8a2e6e3dd22 100644 (file)
--- a/midend.c
+++ b/midend.c
@@ -1610,7 +1610,9 @@ void midend_serialise(midend *me,
 #define wr(h,s) do { \
     char hbuf[80]; \
     char *str = (s); \
-    sprintf(hbuf, "%-8.8s:%d:", (h), (int)strlen(str)); \
+    char lbuf[9];                               \
+    copy_left_justified(lbuf, sizeof(lbuf), h); \
+    sprintf(hbuf, "%s:%d:", lbuf, (int)strlen(str)); \
     write(wctx, hbuf, strlen(hbuf)); \
     write(wctx, str, strlen(str)); \
     write(wctx, "\n", 1); \

diff --git a/misc.c b/misc.c
index fe413327e12c9791d9b86648a882ff73d94c1fa1..c7210165635e5749cbf6cd1f74a91eb17a7dc41a 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -358,6 +358,19 @@ void draw_text_outline(drawing *dr, int x, int y, int fonttype,
         draw_text(dr, x, y+1, fonttype, fontsize, align, outline_colour, text);
     }
     draw_text(dr, x, y, fonttype, fontsize, align, text_colour, text);
+
+}
+
+/* kludge for non-compliant sprintf() */
+void copy_left_justified(char *buf, size_t sz, const char *str)
+{
+    memset(buf, ' ', sz - 1);
+    int len = strlen(str);
+    if(len <= sz - 1)
+        memcpy(buf, str, len);
+    else
+        fatal("overrun");
+    buf[sz - 1] = 0;
 }
 
 /* vim: set shiftwidth=4 tabstop=8: */

diff --git a/puzzles.h b/puzzles.h
index ace66900f2ffc700043cefcefc6e068c7651d013..03af2ca18671183233049537b9384022796476e0 100644 (file)
--- a/puzzles.h
+++ b/puzzles.h
@@ -376,6 +376,11 @@ void pos2c(int w, int h, int pos, int *cx, int *cy);
 void draw_text_outline(drawing *dr, int x, int y, int fonttype,
                        int fontsize, int align,
                        int text_colour, int outline_colour, char *text);
+
+/* Copies text left-justified with spaces. Length of string must be
+ * less than buffer size. */
+void copy_left_justified(char *buf, size_t sz, const char *str);
+
 /*
  * dsf.c
  */