[xine-cvs] CVS: xine-ui/src/xitk/xine-toolkit image.c, 1.69, 1.70 xitk.c, 1.150, 1.151

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk/xine-toolkit
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17889/src/xitk/xine-toolkit

Modified Files:
	image.c xitk.c 
Log Message:
Fix a couple of bugs which were introduced during *printf cleanup, and add
extra constraints in the same areas (where needed).

Index: image.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/xine-toolkit/image.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- image.c	15 Jul 2006 20:26:20 -0000	1.69
+++ image.c	15 Jul 2006 22:39:12 -0000	1.70
@@ -1330,13 +1330,12 @@
       do {
 	nchar++;
 	snprintf(buf, nchar, "%s", title);
-      } while(xitk_font_get_string_length(fs, buf) < (w - 12));
+      } while(xitk_font_get_string_length(fs, buf) < (w - 12) && nchar < sizeof (buf) - 1);
       /* Cut title, add three dots a the end */
-      nchar -= 4;
-      snprintf(buf, nchar, "%s...", title);
+      snprintf(buf, sizeof (buf), "%*s...", nchar - 1, title);
     }
     else
-      strncpy(buf, title, sizeof(buf));
+      snprintf(buf, sizeof(buf), "%s", title);
 
     fwidth = xitk_font_get_string_length(fs, buf);
   }

Index: xitk.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/xine-toolkit/xitk.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- xitk.c	15 Jul 2006 20:26:20 -0000	1.150
+++ xitk.c	15 Jul 2006 22:39:12 -0000	1.151
@@ -1898,7 +1898,7 @@
   strlcat(buffer, " ]-", sizeof(buffer));
 
   if(verbosity)
-    puts(buffer);
+    printf("%s", buffer);
 
   gXitk->wm_type = xitk_check_wm(display);