File xine-ui-sprintf-COMMITTED.diff of Package xine-ui

Overview Repositories Revisions Requests Users Attributes Meta

File xine-ui-sprintf-COMMITTED.diff of Package xine-ui (Revision 3dc8ffc008148740e1ee8f9363f5d521)

Currently displaying revision 3dc8ffc008148740e1ee8f9363f5d521 , Show latest

--- src/common/utils.c
+++ src/common/utils.c
@@ -191,11 +191,11 @@
   memset(&buf, 0, sizeof(buf));
   memset(&buf2, 0, sizeof(buf2));
   
-  sprintf(buf, "%s", path);
+  strcpy(buf, path);
   pp = buf;
   while((p = xine_strsep(&pp, "/")) != NULL) {
     if(p && strlen(p)) {
-      sprintf(buf2, "%s/%s", buf2, p);
+      sprintf(buf2+strlen(buf2), "/%s", p);
       if(!_mkdir_safe(buf2))
 	return 0;
     }
--- src/fb/osd.c
+++ src/fb/osd.c
@@ -305,7 +305,7 @@
     switch(status) {
     case XINE_STATUS_IDLE:
     case XINE_STATUS_STOP:
-      sprintf(buffer, "%s", (_osd_get_status_sym(status)));
+      strcpy(buffer, (_osd_get_status_sym(status)));
       break;
       
     case XINE_STATUS_PLAY:
@@ -320,7 +320,7 @@
 		  secs / (60*60), (secs / 60) % 60, secs % 60);
 	}
 	else
-	  sprintf(buffer, "%s", (_osd_get_speed_sym(speed)));
+	  strcpy(buffer, (_osd_get_speed_sym(speed)));
       }
       break;
       
@@ -392,34 +392,34 @@
     len = strlen(buffer);
     switch(audiochannel) {
     case -2:
-      sprintf(buffer, "%soff", buffer);
+      strcat(buffer, "off");
       break;
     case -1:
       if(!xine_get_audio_lang (fbxine.stream, audiochannel, &buffer[len]))
-	sprintf(buffer, "%sauto", buffer);
+	strcat(buffer, "auto");
       break;
     default:
       if(!xine_get_audio_lang (fbxine.stream, audiochannel, &buffer[len]))
-	sprintf(buffer, "%s%3d", buffer, audiochannel);
+	sprintf(buffer+strlen(buffer), "%3d", audiochannel);
       break;
     }
 
-    sprintf(buffer, "%s, Spu: ", buffer);
+    strcat(buffer, ", Spu: ");
     len = strlen(buffer);
     switch (spuchannel) {
     case -2:
-      sprintf(buffer, "%soff", buffer);
+      strcat(buffer, "off");
       break;
     case -1:
       if(!xine_get_spu_lang (fbxine.stream, spuchannel, &buffer[len]))
-	sprintf(buffer, "%sauto", buffer);
+	strcat(buffer, "auto");
       break;
     default:
       if(!xine_get_spu_lang (fbxine.stream, spuchannel, &buffer[len]))
-        sprintf(buffer, "%s%3d", buffer, spuchannel);
+        sprintf(buffer+strlen(buffer), "%3d", spuchannel);
       break;
     }
-    sprintf(buffer, "%s.", buffer);
+    strcat(buffer, ".");
     xine_osd_draw_text(fbxine.osd.sinfo, x, y, buffer, XINE_OSD_TEXT1);
     xine_osd_get_text_size(fbxine.osd.sinfo, buffer, &w, &h);
     if(w > osdw)
--- src/xitk/actions.c
+++ src/xitk/actions.c
@@ -380,7 +380,7 @@
       
       minfo = xine_get_meta_info(stream, XINE_META_INFO_VIDEOCODEC);
       vfcc = xine_get_stream_info(stream, XINE_STREAM_INFO_VIDEO_FOURCC);
-      sprintf(buffer, _("%sVideo Codec: %s (%s)\n"), buffer,
+      sprintf(buffer+strlen(buffer), _("Video Codec: %s (%s)\n"),
 	      (minfo && strlen(minfo)) ? (char *) minfo : _("Unavailable"), 
 	      (get_fourcc_string(vfcc)));
     }
@@ -391,7 +391,7 @@
       
       minfo = xine_get_meta_info(stream, XINE_META_INFO_AUDIOCODEC);
       afcc = xine_get_stream_info(stream, XINE_STREAM_INFO_AUDIO_FOURCC);
-      sprintf(buffer,  _("%sAudio Codec: %s (%s)\n"), buffer,
+      sprintf(buffer+strlen(buffer),  _("Audio Codec: %s (%s)\n"),
 	      (minfo && strlen(minfo)) ? (char *) minfo : _("Unavailable"), 
 	      (get_fourcc_string(afcc)));
     }
@@ -405,7 +405,7 @@
     if(!gGui->play_anyway) {
       xitk_window_t *xw;
 
-      sprintf(buffer, _("%s\nStart playback anyway ?\n"), buffer);
+      strcat(buffer, _("\nStart playback anyway ?\n"));
       
       play_data.stream             = stream;
       play_data.start_pos          = start_pos;
--- src/xitk/file_browser.c
+++ src/xitk/file_browser.c
@@ -983,7 +983,7 @@
       snprintf(buf, sizeof(buf), "%s", fb->current_dir);
       if(strlen(fb->current_dir) > 1)
 	strcat(buf, "/");
-      sprintf(buf, "%s%s", buf, fb->norm_files[sel].name);
+      strcat(buf, fb->norm_files[sel].name);
       
       if((unlink(buf)) == -1)
 	xine_error(_("Unable to delete file '%s': %s."), buf, strerror(errno));
@@ -1006,7 +1006,7 @@
     snprintf(buf, sizeof(buf), _("Do you really want to delete the file: '%s'"), fb->current_dir);
     if(strlen(fb->current_dir) > 1)
       strcat(buf, "/");
-    sprintf(buf, "%s%s' ?.", buf, fb->norm_files[sel].name);
+    sprintf(buf+strlen(buf), "%s' ?.", fb->norm_files[sel].name);
     
     fb_deactivate(fb);
     xitk_window_dialog_yesno(gGui->imlib_data, _("Confirm deletion ?"),
@@ -1025,7 +1025,7 @@
   snprintf(buf, sizeof(buf), "%s", fb->current_dir);
   if(strlen(fb->current_dir) > 1)
     strcat(buf, "/");
-  sprintf(buf, "%s%s", buf, fb->norm_files[sel].name);
+  strcat(buf, fb->norm_files[sel].name);
   
   if((rename(buf, newname)) == -1)
     xine_error(_("Unable to rename file '%s' to '%s': %s."), buf, newname, strerror(errno));
@@ -1044,7 +1044,7 @@
     snprintf(buf, sizeof(buf), "%s", fb->current_dir);
     if(strlen(fb->current_dir) > 1)
       strcat(buf, "/");
-    sprintf(buf, "%s%s", buf, fb->norm_files[sel].name);
+    strcat(buf, fb->norm_files[sel].name);
     
     fb_deactivate(fb);
     fb_create_input_window(_("Rename file"), buf, fb_rename_file_cb, fb);
--- src/xitk/kbindings.c
+++ src/xitk/kbindings.c
@@ -603,7 +603,7 @@
 	  else {
 	    len += 2;
 	    kmsg = (char *) realloc(kmsg, strlen(kmsg) + len + 1);
-	    sprintf(kmsg, "%s%s%s%c%s%c%s", kmsg, ", ", action1, ' ', dna, ' ', action2);
+	    sprintf(kmsg+strlen(kmsg), "%s%s%c%s%c%s", ", ", action1, ' ', dna, ' ', action2);
 	  }
 	}
       }
@@ -615,7 +615,7 @@
     char          *footer = _(".\n\nWhat do you want to do ?\n");
     
     kmsg = (char *) realloc(kmsg, strlen(kmsg) + strlen(footer) + 1);
-    sprintf(kmsg, "%s%s", kmsg, footer);
+    strcat(kmsg, footer);
 
     dump_error(gGui->verbosity, kmsg);
 
@@ -1016,15 +1016,14 @@
     for(k = kbt->entry, i = 0; k[i]->action != NULL; i++) {
       if(!k[i]->is_alias) {
 	sprintf(buf, "# %s\n", k[i]->comment);
-	sprintf(buf, "%sbegin\n", buf);
-	sprintf(buf, "%s\tremote = xxxxx\n", buf);
-	sprintf(buf, "%s\tbutton = xxxxx\n", buf);
-	sprintf(buf, "%s\tprog   = xine\n", buf);
-	sprintf(buf, "%s\trepeat = 0\n", buf);
-	sprintf(buf, "%s\tconfig = %s\n", buf, k[i]->action);
-	sprintf(buf, "%send\n\n", buf);
+	strcat(buf, "begin\n");
+	strcat(buf, "\tremote = xxxxx\n");
+	strcat(buf, "\tbutton = xxxxx\n");
+	strcat(buf, "\tprog   = xine\n");
+	strcat(buf, "\trepeat = 0\n");
+	sprintf(buf+strlen(buf), "\tconfig = %s\n", k[i]->action);
+	strcat(buf, "end\n\n");
 	fputs(buf, stream);
-	memset(&buf, 0, sizeof(buf));
       }
     }
     fprintf(stream, "##\n# End of xine key bindings.\n##\n");
@@ -1039,31 +1038,30 @@
       snprintf(buf, sizeof(buf), "# %s\n", k[i]->comment);
 
       if(k[i]->is_alias) {
-	sprintf(buf, "%sAlias {\n", buf);
-	sprintf(buf, "%s\tentry = %s\n", buf, k[i]->action);
+	strcat(buf, "Alias {\n");
+	sprintf(buf+strlen(buf), "\tentry = %s\n", k[i]->action);
       }
       else
-	sprintf(buf, "%s%s {\n", buf, k[i]->action);
+	sprintf(buf+strlen(buf), "%s {\n", k[i]->action);
 
-      sprintf(buf, "%s\tkey = %s\n", buf, k[i]->key);
-      sprintf(buf, "%s%s", buf, "\tmodifier = ");
+      sprintf(buf+strlen(buf), "\tkey = %s\n", k[i]->key);
+      strcat(buf, "\tmodifier = ");
       if(k[i]->modifier == KEYMOD_NOMOD)
-	sprintf(buf, "%s%s, ", buf, "none");
+	strcat(buf, "none, ");
       if(k[i]->modifier & KEYMOD_CONTROL)
-	sprintf(buf, "%s%s, ", buf, "control");
+	strcat(buf, "control, ");
       if(k[i]->modifier & KEYMOD_META)
-	sprintf(buf, "%s%s, ", buf, "meta");
+	strcat(buf, "meta, ");
       if(k[i]->modifier & KEYMOD_MOD3)
-	sprintf(buf, "%s%s, ", buf, "mod3");
+	strcat(buf, "mod3, ");
       if(k[i]->modifier & KEYMOD_MOD4)
-	sprintf(buf, "%s%s, ", buf, "mod4");
+	strcat(buf, "mod4, ");
       if(k[i]->modifier & KEYMOD_MOD5)
-	sprintf(buf, "%s%s, ", buf, "mod5");
+	strcat(buf, "mod5, ");
       buf[strlen(buf) - 2] = '\n';
       buf[strlen(buf) - 1] = '\0';
-      sprintf(buf, "%s%s", buf, "}\n\n");
+      strcat(buf, "}\n\n");
       fprintf(stream, "%s", buf);
-      memset(&buf, 0, sizeof(buf));
     }
     fprintf(stream, "##\n# End of xine key bindings.\n##\n");
     break;
@@ -1272,34 +1270,34 @@
   static char shortcut[32];
 
   if(kbe) {
-    memset(&shortcut, 0, sizeof(shortcut));
+    shortcut[0] = 0;
     
     if(gGui->shortcut_style == 0) {
       if(kbe->modifier & KEYMOD_CONTROL)
-	sprintf(shortcut, "%s%s+", shortcut, _("Ctrl"));
+	sprintf(shortcut+strlen(shortcut), "%s+", _("Ctrl"));
       if(kbe->modifier & KEYMOD_META)
-	sprintf(shortcut, "%s%s+", shortcut, _("Alt"));
+	sprintf(shortcut+strlen(shortcut), "%s+", _("Alt"));
       if(kbe->modifier & KEYMOD_MOD3)
-	sprintf(shortcut, "%s%s+", shortcut, "M3");
+	strcat(shortcut, "M3+");
       if(kbe->modifier & KEYMOD_MOD4)
-	sprintf(shortcut, "%s%s+", shortcut, "M4");
+	strcat(shortcut, "M4+");
       if(kbe->modifier & KEYMOD_MOD5)
-	sprintf(shortcut, "%s%s+", shortcut, "M5");
+	strcat(shortcut, "M5+");
     }
     else {
       if(kbe->modifier & KEYMOD_CONTROL)
-	sprintf(shortcut, "%s%s-", shortcut, "C");
+	strcat(shortcut, "C-");
       if(kbe->modifier & KEYMOD_META)
-	sprintf(shortcut, "%s%s-", shortcut, "M");
+	strcat(shortcut, "M-");
       if(kbe->modifier & KEYMOD_MOD3)
-	sprintf(shortcut, "%s%s-", shortcut, "M3");
+	strcat(shortcut, "M3-");
       if(kbe->modifier & KEYMOD_MOD4)
-	sprintf(shortcut, "%s%s-", shortcut, "M4");
+	strcat(shortcut, "M4-");
       if(kbe->modifier & KEYMOD_MOD5)
-	sprintf(shortcut, "%s%s-", shortcut, "M5");
+	strcat(shortcut, "M5-");
     }
     
-    sprintf(shortcut, "%s%s", shortcut, kbe->key);
+    strcat(shortcut, kbe->key);
     
     return shortcut;
   }
@@ -1850,7 +1848,7 @@
     
   case KBEDIT_EDITING:
     kbedit->ksel->key = (char *) realloc(kbedit->ksel->key, sizeof(char *) * (strlen(kbe->key) + 1));
-    sprintf(kbedit->ksel->key, "%s", kbe->key);
+    strcpy(kbedit->ksel->key, kbe->key);
     kbedit->ksel->modifier = kbe->modifier;
     
     kbedit_create_browser_entries();
@@ -2491,26 +2489,26 @@
 	memset(&buf, 0, sizeof(buf));
 	
 	if(k[i]->modifier & KEYMOD_CONTROL)
-	  sprintf(buf, "%s", "\\fBC\\fP");
+	  strcpy(buf, "\\fBC\\fP");
 	if(k[i]->modifier & KEYMOD_META) {
-	  if(strlen(buf))
-	    sprintf(buf, "%s%s", buf, "\\-");
-	  sprintf(buf, "%s%s", buf, "\\fBM\\fP");
+	  if(buf[0])
+	    strcat(buf, "\\-");
+	  strcat(buf, "\\fBM\\fP");
 	}
 	if(k[i]->modifier & KEYMOD_MOD3) {
-	  if(strlen(buf))
-	    sprintf(buf, "%s%s", buf, "\\-");
-	  sprintf(buf, "%s%s", buf, "\\fBM3\\fP");
+	  if(buf[0])
+	    strcat(buf, "\\-");
+	  strcat(buf, "\\fBM3\\fP");
 	}
 	if(k[i]->modifier & KEYMOD_MOD4) {
-	  if(strlen(buf))
-	    sprintf(buf, "%s%s", buf, "\\-");
-	  sprintf(buf, "%s%s", buf, "\\fBM4\\fP");
+	  if(buf[0])
+	    strcat(buf, "\\-");
+	  strcat(buf, "\\fBM4\\fP");
 	}
 	if(k[i]->modifier & KEYMOD_MOD5) {
-	  if(strlen(buf))
-	    sprintf(buf, "%s%s", buf, "\\-");
-	  sprintf(buf, "%s%s", buf, "\\fBM5\\fP");
+	  if(buf[0])
+	    strcat(buf, "\\-");
+	  strcat(buf, "\\fBM5\\fP");
 	}
 	printf("%s\\-", buf);
       }
--- src/xitk/main.c
+++ src/xitk/main.c
@@ -458,7 +458,7 @@
 
   printf("%s", title);
   
-  sprintf(buffer, "%s", blanks);
+  strcpy(buffer, blanks);
   plugin = *plugins++;
   
   while(plugin) {
@@ -466,7 +466,7 @@
     len = strlen(buffer);
     
     if((len + (strlen(plugin) + 3)) < 80) {
-      sprintf(buffer, "%s%s%s", buffer, (strlen(buffer) == strlen(blanks)) ? "" : ", ", plugin);
+      sprintf(buffer+strlen(buffer), "%s%s", (strlen(buffer) == strlen(blanks)) ? "" : ", ", plugin);
     }
     else {
       printf("%s", buffer);
@@ -1107,9 +1107,9 @@
 		 "%s:", _("*drum roll*, xine lib wants to take your attention "
 			  "to deliver an important message to you ;-):"));
 	if(data->explanation)
-	  sprintf(buffer, "%s %s %s", buffer, (char *) data + data->explanation, (char *) data + data->parameters);
+	  sprintf(buffer+strlen(buffer), " %s %s", (char *) data + data->explanation, (char *) data + data->parameters);
 	else
-	  sprintf(buffer, "%s %s", buffer, _("No Information available."));
+	  sprintf(buffer+strlen(buffer), " %s", _("No Information available."));
 	  
 	break;
 
@@ -1118,14 +1118,14 @@
 	snprintf(buffer, sizeof(buffer), "%s", _("The host you're trying to connect is unknown.\n"
 						 "Check the validity of the specified hostname."));
 	if(data->explanation)
-	  sprintf(buffer, "%s (%s)", buffer, (char *) data + data->parameters);
+	  sprintf(buffer+strlen(buffer), " (%s)", (char *) data + data->parameters);
 	break;
 	
 	/* (device name) */
       case XINE_MSG_UNKNOWN_DEVICE:
 	snprintf(buffer, sizeof(buffer), "%s", _("The device name you specified seems invalid."));
 	if(data->explanation)
-	  sprintf(buffer, "%s (%s)", buffer, (char *) data + data->parameters);
+	  sprintf(buffer+strlen(buffer), " (%s)", (char *) data + data->parameters);
 	break;
 
 	/* none */
@@ -1133,21 +1133,21 @@
 	snprintf(buffer, sizeof(buffer), "%s", _("The network looks unreachable.\nCheck your network "
 						 "setup and/or the server name."));
 	if(data->explanation)
-	  sprintf(buffer, "%s (%s)", buffer, (char *) data + data->parameters);
+	  sprintf(buffer+strlen(buffer), " (%s)", (char *) data + data->parameters);
 	break;
 
 	/* (host name) */
       case XINE_MSG_CONNECTION_REFUSED:
 	snprintf(buffer, sizeof(buffer), "%s", _("The connection was refused.\nCheck the host name."));
 	if(data->explanation)
-	  sprintf(buffer, "%s (%s)", buffer, (char *) data + data->parameters);
+	  sprintf(buffer+strlen(buffer), " (%s)", (char *) data + data->parameters);
 	break;
 
 	/* (file name or mrl) */
       case XINE_MSG_FILE_NOT_FOUND:
 	snprintf(buffer, sizeof(buffer), "%s", _("The specified file or mrl is not found. Please check it twice."));
 	if(data->explanation)
-	  sprintf(buffer, "%s (%s)", buffer, (char *) data + data->parameters);
+	  sprintf(buffer+strlen(buffer), " (%s)", (char *) data + data->parameters);
 	break;
 
 	/* (device/file/mrl) */
@@ -1156,27 +1156,27 @@
 						 "rights for this, or source doesn't contain data "
 						 "(e.g: not disc in drive)."));
 	if(data->explanation)
-	  sprintf(buffer, "%s (%s)", buffer, (char *) data + data->parameters);
+	  sprintf(buffer+strlen(buffer), " (%s)", (char *) data + data->parameters);
 	break;
 	
 	/* (library/decoder) */
       case XINE_MSG_LIBRARY_LOAD_ERROR:
 	snprintf(buffer, sizeof(buffer), "%s", _("A problem occur while loading a library or a decoder"));
 	if(data->explanation)
-	  sprintf(buffer, "%s: %s", buffer, (char *) data + data->parameters);
+	  sprintf(buffer+strlen(buffer), ": %s", (char *) data + data->parameters);
 	break;
 
 	/* none */
       case XINE_MSG_ENCRYPTED_SOURCE:
 	snprintf(buffer, sizeof(buffer), "%s", _("The source seems encrypted, and can't be read."));
 	if(!strncasecmp(gGui->mmk.mrl, "dvd:/", 5)) {
-	  sprintf(buffer, "%s%s", buffer, _("\nYour DVD is probably crypted. "
-					    "According to your country laws, you can or can't "
-					    "install/use libdvdcss to be able to read this disc, "
-					    "which you bought."));
+	  strcat(buffer, _("\nYour DVD is probably crypted. "
+			   "According to your country laws, you can or can't "
+			   "install/use libdvdcss to be able to read this disc, "
+			   "which you bought."));
 	}
 	if(data->explanation)
-	  sprintf(buffer, "%s (%s)", buffer, (char *) data + data->parameters);
+	  sprintf(buffer+strlen(buffer), " (%s)", (char *) data + data->parameters);
 	break;
 
 	/* (warning message) */
@@ -1197,17 +1197,17 @@
       default:
 	snprintf(buffer, sizeof(buffer), "%s", _("*sight*, unkown error."));
 	if(data->explanation)
-	  sprintf(buffer, "%s (%s %s)", buffer, (char *) data + data->explanation, (char *) data + data->parameters);
+	  sprintf(buffer+strlen(buffer), " (%s %s)", (char *) data + data->explanation, (char *) data + data->parameters);
 	break;
       }
       
       if(gGui->verbosity >= XINE_VERBOSITY_DEBUG) {
-	sprintf(buffer, "%s\n\n[", buffer);
+	strcat(buffer, "\n\n[");
 	
 	if(data->explanation)
-	  sprintf(buffer, "%s'%s' '%s'", buffer, (char *) data + data->explanation, (char *) data + data->parameters);
+	  sprintf(buffer+strlen(buffer), "'%s' '%s'", (char *) data + data->explanation, (char *) data + data->parameters);
 	
-	sprintf(buffer, "%s]", buffer);
+	strcat(buffer, "]");
       }
       
       if(strlen(buffer))
--- src/xitk/mediamark.c
+++ src/xitk/mediamark.c
@@ -561,7 +561,7 @@
 		    if((buffer[strlen(buffer) - 1] == '/') && (*ln == '/'))
 		      buffer[strlen(buffer) - 1] = '\0';
 		    
-		    sprintf(buffer, "%s%s", buffer, ln);
+		    strcat(buffer, ln);
 		    
 		    if(_file_exist(buffer))
 		      entry = buffer;
@@ -681,7 +681,7 @@
 			  if((buffer[strlen(buffer) - 1] == '/') && (*ln == '/'))
 			    buffer[strlen(buffer) - 1] = '\0';
 			  
-			  sprintf(buffer, "%s%s", buffer, ln);
+			  strcat(buffer, ln);
 			  
 			  if(_file_exist(buffer))
 			    entry = buffer;
@@ -774,7 +774,7 @@
 		  if((buffer[strlen(buffer) - 1] == '/') && (*ln == '/'))
 		    buffer[strlen(buffer) - 1] = '\0';
 		  
-		  sprintf(buffer, "%s%s", buffer, ln);
+		  strcat(buffer, ln);
 		  
 		  if(_file_exist(buffer))
 		    entry = buffer;
@@ -1122,10 +1122,10 @@
 		  
 		if(atitle && strlen(atitle)) {
 		  real_title = (char *) xine_xmalloc(len);
-		  sprintf(real_title, "%s", atitle);
+		  strcpy(real_title, atitle);
 		    
 		  if(aauthor && strlen(aauthor))
-		    sprintf(real_title, "%s (%s)", real_title, aauthor);
+		    sprintf(real_title+strlen(real_title), " (%s)", aauthor);
 		}
 		  
 		mmk = (mediamark_t **) realloc(mmk, sizeof(mediamark_t *) * (entries_asx + 2));
--- src/xitk/network.c
+++ src/xitk/network.c
@@ -550,7 +550,7 @@
   /* Each line sent is '\n' terminated */
   if(cr) {
     if((buf[strlen(buf)] == '\0') && (buf[strlen(buf) - 1] != '\n'))
-      sprintf(buf, "%s%c", buf, '\n');
+      strcat(buf, "\n");
   }
   
   return _sock_write(socket, buf, strlen(buf));
@@ -746,15 +746,15 @@
   while(session_commands[i]->command != NULL) {
     if(session_commands[i]->enable) {
       if((curpos + maxlen) >= 80) {
-	sprintf(buf, "%s\n       ", buf);
+	strcat(buf, "\n       ");
 	curpos = 7;
       }
       
-      sprintf(buf, "%s%s", buf, session_commands[i]->command);
+      strcat(buf, session_commands[i]->command);
       curpos += strlen(session_commands[i]->command);
       
       for(j = 0; j < (maxlen - strlen(session_commands[i]->command)); j++) {
-	sprintf(buf, "%s ", buf);
+	strcat(buf, " ");
 	curpos++;
       }
     }
@@ -1112,7 +1112,7 @@
 
   for(i = 0; i < num_commands; i++) {
     if(strlen(buf))
-      sprintf(buf, "%s %s", buf, commands[i]);
+      sprintf(buf+strlen(buf), " %s", commands[i]);
     else
       snprintf(buf, sizeof(buf), "%s", commands[i]);
   }
@@ -1662,8 +1662,7 @@
 
     client_info->command.line = (char *) realloc(client_info->command.line, strlen(line) + 1);
     
-    memset(client_info->command.line, 0, sizeof(client_info->command.line));
-    sprintf(client_info->command.line, "%s", line);
+    strcpy(client_info->command.line, line);
 
   }
 }
@@ -1704,16 +1703,15 @@
   int i = 0;
   char buf[_BUFSIZ];
 
-  memset(&buf, 0, sizeof(buf));
-  snprintf(buf, sizeof(buf), "%s", COMMANDS_PREFIX);
+  strcpy(buf, COMMANDS_PREFIX);
   
   while(commands[i].command != NULL) {
     if(commands[i].public) {
-      sprintf(buf, "%s\t%s", buf, commands[i].command);
+      sprintf(buf+strlen(buf), "\t%s", commands[i].command);
     }
     i++;
   }
-  sprintf(buf, "%s.\n", buf);
+  strcat(buf, ".\n");
   sock_write(client_info->socket, buf);
 }
 
@@ -1744,22 +1742,22 @@
     while(commands[i].command != NULL) {
       if(commands[i].public) {
 	if((curpos + maxlen) >= 80) {
-	  sprintf(buf, "%s\n       ", buf);
+	  strcat(buf, "\n       ");
 	  curpos = 7;
 	}
 	
-	sprintf(buf, "%s%s", buf, commands[i].command);
+	strcat(buf, commands[i].command);
 	curpos += strlen(commands[i].command);
 	
 	for(j = 0; j < (maxlen - strlen(commands[i].command)); j++) {
-	  sprintf(buf, "%s ", buf);
+	  strcat(buf, " ");
 	  curpos++;
 	}
       }
       i++;
     }
     
-    sprintf(buf, "%s\n", buf);
+    strcat(buf, "\n");
     sock_write(client_info->socket, buf);
   }
   else {
@@ -2087,22 +2085,22 @@
 	char buf[64];
 	int  status;
 
-	snprintf(buf, sizeof(buf), "%s", "Current status: ");
+	strcpy(buf, "Current status: ");
 	status = xine_get_status(gGui->stream);
 	
 	if(status <= XINE_STATUS_QUIT)
-	  sprintf(buf, "%s%s", buf, status_struct[status].name);
+	  strcat(buf, status_struct[status].name);
 	else
-	  sprintf(buf, "%s%s", buf, "*UNKNOWN*");
+	  strcat(buf, "*UNKNOWN*");
 	
-	sprintf(buf, "%s%c", buf, '\n');
+	strcat(buf, "\n");
 	sock_write(client_info->socket, buf);
       }
       else if(is_arg_contain(client_info, 1, "speed")) {
 	char buf[64];
 	int  speed = -1, i;
 	
-	snprintf(buf, sizeof(buf), "%s", "Current speed: ");
+	strcpy(buf, "Current speed: ");
 	speed = xine_get_param(gGui->stream, XINE_PARAM_SPEED);
 
 	for(i = 0; speeds_struct[i].name != NULL; i++) {
@@ -2111,11 +2109,11 @@
 	}
 	
 	if(i < ((sizeof(speeds_struct) / sizeof(speeds_struct[0])) - 1))
-	  sprintf(buf, "%s%s", buf, speeds_struct[i].name);
+	  strcat(buf, speeds_struct[i].name);
 	else
-	  sprintf(buf, "%s%s", buf, "*UNKNOWN*");
+	  strcat(buf, "*UNKNOWN*");
 	
-	sprintf(buf, "%s%c", buf, '\n');
+	strcat(buf, "\n");
 	sock_write(client_info->socket, buf);
       }
       else if(is_arg_contain(client_info, 1, "position")) {
@@ -2149,26 +2147,26 @@
 
 	switch(gGui->playlist.loop) {
 	case PLAYLIST_LOOP_NO_LOOP:
-	  sprintf(buf, "%s%s", buf, "'No Loop'");
+	  strcat(buf, "'No Loop'");
 	  break;
 	case PLAYLIST_LOOP_LOOP:
-	  sprintf(buf, "%s%s", buf, "'Loop'");
+	  strcat(buf, "'Loop'");
 	  break;
 	case PLAYLIST_LOOP_REPEAT:
-	  sprintf(buf, "%s%s", buf, "'Repeat'");
+	  strcat(buf, "'Repeat'");
 	  break;
 	case PLAYLIST_LOOP_SHUFFLE:
-	  sprintf(buf, "%s%s", buf, "'Shuffle'");
+	  strcat(buf, "'Shuffle'");
 	  break;
 	case PLAYLIST_LOOP_SHUF_PLUS:	
-	  sprintf(buf, "%s%s", buf, "'Shuffle forever'");
+	  strcat(buf, "'Shuffle forever'");
 	  break;
 	default:
-	  sprintf(buf, "%s%s", buf, "'!!Unknown!!'");
+	  strcat(buf, "'!!Unknown!!'");
 	  break;
 	}
 
-	sprintf(buf, "%s.\n", buf);
+	strcat(buf, ".\n");
 	sock_write(client_info->socket, buf);
       }
     }
@@ -2637,11 +2635,11 @@
 	p++;
       
       if(p)
-	snprintf(remaining, sizeof(remaining), "%s", (_atoa(p)));
+	strcpy(remaining, (_atoa(p)));
       
       client_info->command.line = (char *) realloc(client_info->command.line, sizeof(char *) * (strlen(c) + 1));
       
-      sprintf(client_info->command.line, "%s", c);
+      strcpy(client_info->command.line, c);
       
       if(p) {
 	/* remove last ';' */
@@ -2656,7 +2654,7 @@
 	if(strlen(remaining)) {
 	  client_info->command.remain = (char *) realloc(client_info->command.remain, 
 							 sizeof(char *) * (strlen(remaining) + 1));
-	  sprintf(client_info->command.remain, "%s", remaining);
+	  strcpy(client_info->command.remain, remaining);
 	}
 	else {
 	  SAFE_FREE(client_info->command.remain);
@@ -2672,7 +2670,7 @@
       client_info->command.line = (char *) realloc(client_info->command.line, 
 						   sizeof(char *) * (strlen(client_info->command.remain) + 1));
       
-      sprintf(client_info->command.line, "%s", client_info->command.remain);
+      strcpy(client_info->command.line, client_info->command.remain);
       
       SAFE_FREE(client_info->command.remain);
     }
@@ -2767,7 +2765,7 @@
 	  if((*(pcmd - 1) != '\\') && (get_quote == 0)) {
 
 	  __end_args:
-	    sprintf(client_info->command.args[nargs], "%s", _atoa(buf));
+	    strcpy(client_info->command.args[nargs], _atoa(buf));
 	    nargs++;
 	    memset(&buf, 0, sizeof(buf));
 	    pb = buf;
@@ -2793,8 +2791,7 @@
   else {
     client_info->command.command = (char *) realloc(client_info->command.command, strlen(client_info->command.line) + 1);
     
-    memset(client_info->command.command, 0, sizeof(client_info->command.command));
-    sprintf(client_info->command.command, "%s", client_info->command.line);
+    strcpy(client_info->command.command, client_info->command.line);
   }
 
 #if 0
--- src/xitk/osd.c
+++ src/xitk/osd.c
@@ -355,40 +355,38 @@
       y += h;
     }
     
-    memset(&buffer, 0, sizeof(buffer));
-
-    snprintf(buffer, sizeof(buffer), "%s", _("Audio: "));
+    strcpy(buffer, _("Audio: "));
     len = strlen(buffer);
     switch(audiochannel) {
     case -2:
-      sprintf(buffer, "%s%s", buffer, "off");
+      strcat(buffer, "off");
       break;
     case -1:
       if(!xine_get_audio_lang (gGui->stream, audiochannel, &buffer[len]))
-	sprintf(buffer, "%s%s", buffer, "auto");
+	strcat(buffer, "auto");
       break;
     default:
       if(!xine_get_audio_lang (gGui->stream, audiochannel, &buffer[len]))
-	sprintf(buffer, "%s%3d", buffer, audiochannel);
+	sprintf(buffer+strlen(buffer), "%3d", audiochannel);
       break;
     }
 
-    sprintf(buffer, "%s%s", buffer, ", Spu: ");
+    strcat(buffer, ", Spu: ");
     len = strlen(buffer);
     switch (spuchannel) {
     case -2:
-      sprintf(buffer, "%s%s", buffer, "off");
+      strcat(buffer, "off");
       break;
     case -1:
       if(!xine_get_spu_lang (gGui->stream, spuchannel, &buffer[len]))
-	sprintf(buffer, "%s%s", buffer, "auto");
+	strcat(buffer, "auto");
       break;
     default:
       if(!xine_get_spu_lang (gGui->stream, spuchannel, &buffer[len]))
-        sprintf(buffer, "%s%3d", buffer, spuchannel);
+        sprintf(buffer+strlen(buffer), "%3d", spuchannel);
       break;
     }
-    sprintf(buffer, "%s.", buffer);
+    strcat(buffer, ".");
     xine_osd_draw_text(gGui->osd.sinfo.osd[0], x, y, buffer, XINE_OSD_TEXT1);
     xine_osd_get_text_size(gGui->osd.sinfo.osd[0], buffer, &w, &h);
     if(w > osdw)
@@ -407,12 +405,12 @@
       int totaldays;
       
       totaldays  = totaltime / (3600 * 24);
-      sprintf(buffer, "%s(%.0f%%) %s ", buffer, ((float)playedtime / (float)totaltime) * 100, _("of"));
+      sprintf(buffer+strlen(buffer), "(%.0f%%) %s ", ((float)playedtime / (float)totaltime) * 100, _("of"));
       
       if(totaldays > 0)
-	sprintf(buffer, "%s%d::%02d", buffer, totaldays, totaltime / 3600);
+	sprintf(buffer+strlen(buffer), "%d::%02d", totaldays, totaltime / 3600);
       else
-	sprintf(buffer, "%s%d:%02d:%02d", buffer, totaltime / 3600, (totaltime % 3600) / 60, totaltime % 60);
+	sprintf(buffer+strlen(buffer), "%d:%02d:%02d", totaltime / 3600, (totaltime % 3600) / 60, totaltime % 60);
     }
     
     xine_osd_draw_text(gGui->osd.sinfo.osd[0], x, y, buffer, XINE_OSD_TEXT1);
--- src/xitk/stream_infos.c
+++ src/xitk/stream_infos.c
@@ -260,16 +260,16 @@
       len += strlen(aalbum) + 3;
     
     ident = (char *) xine_xmalloc(len + 1);
-    sprintf(ident, "%s", atitle);
+    strcpy(ident, atitle);
     
     if((aartist && strlen(aartist)) || (aalbum && strlen(aalbum))) {
       strcat(ident, " (");
       if(aartist && strlen(aartist))
-	sprintf(ident, "%s%s", ident, aartist);
+	strcat(ident, aartist);
       if((aartist && strlen(aartist)) && (aalbum && strlen(aalbum)))
 	strcat(ident, " - ");
       if(aalbum && strlen(aalbum))
-	sprintf(ident, "%s%s", ident, aalbum);
+	strcat(ident, aalbum);
       strcat(ident, ")");
     }
   }
--- src/xitk/viewlog.c
+++ src/xitk/viewlog.c
@@ -229,7 +229,7 @@
 	    break;
 	    
 	  default:
-	    sprintf(buf, "%s%c", buf, *p);
+	    sprintf(buf+strlen(buf), "%c", *p);
 	    break;
 	  }
 	  
--- src/xitk/xine-remote.c
+++ src/xitk/xine-remote.c
@@ -550,7 +550,7 @@
   /* Each line sent is '\n' terminated */
   if(cr) {
     if((buf[strlen(buf)] == '\0') && (buf[strlen(buf) - 1] != '\n'))
-      sprintf(buf, "%s%c", buf, '\n');
+      strcat(buf, "\n");
   }
   
   return _sock_write(socket, buf, strlen(buf));
@@ -746,15 +746,15 @@
   while(session_commands[i]->command != NULL) {
     if(session_commands[i]->enable) {
       if((curpos + maxlen) >= 80) {
-	sprintf(buf, "%s\n       ", buf);
+	strcat(buf, "\n       ");
 	curpos = 7;
       }
       
-      sprintf(buf, "%s%s", buf, session_commands[i]->command);
+      strcat(buf, session_commands[i]->command);
       curpos += strlen(session_commands[i]->command);
       
       for(j = 0; j < (maxlen - strlen(session_commands[i]->command)); j++) {
-	sprintf(buf, "%s ", buf);
+	strcat(buf, " ");
 	curpos++;
       }
     }
@@ -1108,13 +1108,13 @@
   int i;
   char buf[_BUFSIZ];
   
-  memset(&buf, 0, sizeof(buf));
+  buf[0] = 0;
 
   for(i = 0; i < num_commands; i++) {
-    if(strlen(buf))
-      sprintf(buf, "%s %s", buf, commands[i]);
+    if(buf[0])
+      sprintf(buf+strlen(buf), " %s", commands[i]);
     else
-      snprintf(buf, sizeof(buf), "%s", commands[i]);
+      strcpy(buf, commands[i]);
   }
 
   client_handle_command(session, buf);
@@ -1662,8 +1662,7 @@
 
     client_info->command.line = (char *) realloc(client_info->command.line, strlen(line) + 1);
     
-    memset(client_info->command.line, 0, sizeof(client_info->command.line));
-    sprintf(client_info->command.line, "%s", line);
+    strcpy(client_info->command.line, line);
 
   }
 }
@@ -1704,16 +1703,15 @@
   int i = 0;
   char buf[_BUFSIZ];
 
-  memset(&buf, 0, sizeof(buf));
-  snprintf(buf, sizeof(buf), "%s", COMMANDS_PREFIX);
+  strcpy(buf, COMMANDS_PREFIX);
   
   while(commands[i].command != NULL) {
     if(commands[i].public) {
-      sprintf(buf, "%s\t%s", buf, commands[i].command);
+      sprintf(buf+strlen(buf), "\t%s", commands[i].command);
     }
     i++;
   }
-  sprintf(buf, "%s.\n", buf);
+  strcat(buf, ".\n");
   sock_write(client_info->socket, buf);
 }
 
@@ -1744,22 +1742,22 @@
     while(commands[i].command != NULL) {
       if(commands[i].public) {
 	if((curpos + maxlen) >= 80) {
-	  sprintf(buf, "%s\n       ", buf);
+	  strcat(buf, "\n       ");
 	  curpos = 7;
 	}
 	
-	sprintf(buf, "%s%s", buf, commands[i].command);
+	strcat(buf, commands[i].command);
 	curpos += strlen(commands[i].command);
 	
 	for(j = 0; j < (maxlen - strlen(commands[i].command)); j++) {
-	  sprintf(buf, "%s ", buf);
+	  strcat(buf, " ");
 	  curpos++;
 	}
       }
       i++;
     }
     
-    sprintf(buf, "%s\n", buf);
+    strcat(buf, "\n");
     sock_write(client_info->socket, buf);
   }
   else {
@@ -2091,18 +2089,18 @@
 	status = xine_get_status(gGui->stream);
 	
 	if(status <= XINE_STATUS_QUIT)
-	  sprintf(buf, "%s%s", buf, status_struct[status].name);
+	  strcat(buf, status_struct[status].name);
 	else
-	  sprintf(buf, "%s%s", buf, "*UNKNOWN*");
+	  strcat(buf, "*UNKNOWN*");
 	
-	sprintf(buf, "%s%c", buf, '\n');
+	strcat(buf, "\n");
 	sock_write(client_info->socket, buf);
       }
       else if(is_arg_contain(client_info, 1, "speed")) {
 	char buf[64];
 	int  speed = -1, i;
 	
-	snprintf(buf, sizeof(buf), "%s", "Current speed: ");
+	strcpy(buf, "Current speed: ");
 	speed = xine_get_param(gGui->stream, XINE_PARAM_SPEED);
 
 	for(i = 0; speeds_struct[i].name != NULL; i++) {
@@ -2111,11 +2109,11 @@
 	}
 	
 	if(i < ((sizeof(speeds_struct) / sizeof(speeds_struct[0])) - 1))
-	  sprintf(buf, "%s%s", buf, speeds_struct[i].name);
+	  strcat(buf, speeds_struct[i].name);
 	else
-	  sprintf(buf, "%s%s", buf, "*UNKNOWN*");
+	  strcat(buf, "*UNKNOWN*");
 	
-	sprintf(buf, "%s%c", buf, '\n');
+	strcat(buf, "\n");
 	sock_write(client_info->socket, buf);
       }
       else if(is_arg_contain(client_info, 1, "position")) {
@@ -2149,26 +2147,26 @@
 
 	switch(gGui->playlist.loop) {
 	case PLAYLIST_LOOP_NO_LOOP:
-	  sprintf(buf, "%s%s", buf, "'No Loop'");
+	  strcat(buf, "'No Loop'");
 	  break;
 	case PLAYLIST_LOOP_LOOP:
-	  sprintf(buf, "%s%s", buf, "'Loop'");
+	  strcat(buf, "'Loop'");
 	  break;
 	case PLAYLIST_LOOP_REPEAT:
-	  sprintf(buf, "%s%s", buf, "'Repeat'");
+	  strcat(buf, "'Repeat'");
 	  break;
 	case PLAYLIST_LOOP_SHUFFLE:
-	  sprintf(buf, "%s%s", buf, "'Shuffle'");
+	  strcat(buf, "'Shuffle'");
 	  break;
 	case PLAYLIST_LOOP_SHUF_PLUS:	
-	  sprintf(buf, "%s%s", buf, "'Shuffle forever'");
+	  strcat(buf, "'Shuffle forever'");
 	  break;
 	default:
-	  sprintf(buf, "%s%s", buf, "'!!Unknown!!'");
+	  strcat(buf, "'!!Unknown!!'");
 	  break;
 	}
 
-	sprintf(buf, "%s.\n", buf);
+	strcat(buf, ".\n");
 	sock_write(client_info->socket, buf);
       }
     }
@@ -2637,11 +2635,11 @@
 	p++;
       
       if(p)
-	snprintf(remaining, sizeof(remaining), "%s", (_atoa(p)));
+	stcpy(remaining, (_atoa(p)));
       
       client_info->command.line = (char *) realloc(client_info->command.line, sizeof(char *) * (strlen(c) + 1));
       
-      sprintf(client_info->command.line, "%s", c);
+      strcpy(client_info->command.line, c);
       
       if(p) {
 	/* remove last ';' */
@@ -2656,7 +2654,7 @@
 	if(strlen(remaining)) {
 	  client_info->command.remain = (char *) realloc(client_info->command.remain, 
 							 sizeof(char *) * (strlen(remaining) + 1));
-	  sprintf(client_info->command.remain, "%s", remaining);
+	  strcpy(client_info->command.remain, remaining);
 	}
 	else {
 	  SAFE_FREE(client_info->command.remain);
@@ -2672,7 +2670,7 @@
       client_info->command.line = (char *) realloc(client_info->command.line, 
 						   sizeof(char *) * (strlen(client_info->command.remain) + 1));
       
-      sprintf(client_info->command.line, "%s", client_info->command.remain);
+      strcpy(client_info->command.line, client_info->command.remain);
       
       SAFE_FREE(client_info->command.remain);
     }
@@ -2767,7 +2765,7 @@
 	  if((*(pcmd - 1) != '\\') && (get_quote == 0)) {
 
 	  __end_args:
-	    sprintf(client_info->command.args[nargs], "%s", _atoa(buf));
+	    strcpy(client_info->command.args[nargs], _atoa(buf));
 	    nargs++;
 	    memset(&buf, 0, sizeof(buf));
 	    pb = buf;
@@ -2793,8 +2791,7 @@
   else {
     client_info->command.command = (char *) realloc(client_info->command.command, strlen(client_info->command.line) + 1);
     
-    memset(client_info->command.command, 0, sizeof(client_info->command.command));
-    sprintf(client_info->command.command, "%s", client_info->command.line);
+    strcpy(client_info->command.command, client_info->command.line);
   }
 
 #if 0
--- src/xitk/xine-toolkit/config.c
+++ src/xitk/xine-toolkit/config.c
@@ -115,7 +115,7 @@
       xtcf->fonts.fallback = strdup(c);
     else if(!strncasecmp(p, "system", 6)) {
       xtcf->fonts.system = (char *) realloc(xtcf->fonts.system, (strlen(c) + 1));
-      sprintf(xtcf->fonts.system, "%s", c);
+      strcpy(xtcf->fonts.system, c);
     }
     else if(!strncasecmp(p, "xmb", 3)) {
       xtcf->fonts.xmb = ((strtol(c, &c, 10)) >= 1) ? 1 : 0;
@@ -488,7 +488,7 @@
     sprintf(rcfile, "%s/.xine/%s", xitk_get_homedir(), user_rc);
     if((xtcf->fd = fopen(rcfile, "r")) == NULL) {
       rcfile = (char *) realloc(rcfile, (strlen(SYSTEM_RC) + 1));
-      sprintf(rcfile, "%s", SYSTEM_RC);
+      strcpy(rcfile, SYSTEM_RC);
       if((xtcf->fd = fopen(rcfile, "r")) == NULL) {
         XITK_FREE(rcfile);
         rcfile = NULL;
--- src/xitk/xine-toolkit/image.c
+++ src/xitk/xine-toolkit/image.c
@@ -1334,10 +1334,10 @@
       /* Cut title, add three dots a the end */
       nchar -= 4;
       snprintf(buf, nchar, "%s", title);
-      sprintf(buf, "%s%s", buf, "...");
+      strcat(buf, "...");
     }
     else
-      sprintf(buf, "%s", title);
+      strcpy(buf, title);
 
     fwidth = xitk_font_get_string_length(fs, buf);
   }
--- src/xitk/xine-toolkit/inputtext.c
+++ src/xitk/xine-toolkit/inputtext.c
@@ -1014,7 +1014,7 @@
 	    
 	    private_data->text = (char *) realloc(private_data->text, strlen(oldtext) + 3);
 
-	    sprintf(private_data->text, "%s", oldtext);
+	    strcpy(private_data->text, oldtext);
 	    sprintf(&private_data->text[pos], "%c%s", buf[0], &oldtext[pos]);
 	    private_data->text[strlen(private_data->text)] = '\0';
 	    free(oldtext);
@@ -1027,7 +1027,8 @@
 	else {
 	  private_data->text = (char *) xitk_xmalloc(2);
 	  
-	  sprintf(private_data->text, "%c%c", buf[0], 0);
+	  private_data->text[0] = buf[0];
+	  private_data->text[1] = 0;
 	  
 	  private_data->cursor_pos++;
 	  paint_inputtext(w);
--- src/xitk/xine-toolkit/label.c
+++ src/xitk/xine-toolkit/label.c
@@ -52,7 +52,7 @@
     if((strlen(private_data->label)) > private_data->length)
       sprintf(_label, "%s *** %s", private_data->label, private_data->label);
     else
-      sprintf(_label, "%s", private_data->label);
+      strcpy(_label, private_data->label);
     
   }
   else
--- src/xitk/xine-toolkit/mrlbrowser.c
+++ src/xitk/xine-toolkit/mrlbrowser.c
@@ -336,7 +336,7 @@
     private_data->last_mrl_source = (char *) realloc(private_data->last_mrl_source, strlen(lbl) + 1);
     
     old_old_src = strdup(private_data->last_mrl_source);
-    sprintf(private_data->last_mrl_source, "%s", lbl);
+    strcpy(private_data->last_mrl_source, lbl);
 
     {
       int num_mrls;
@@ -345,7 +345,7 @@
 					       NULL, &num_mrls);
       if(!mtmp) {
 	private_data->last_mrl_source = (char *) realloc(private_data->last_mrl_source, strlen(old_old_src) + 1);
-	sprintf(private_data->last_mrl_source, "%s", old_old_src);
+	strcpy(private_data->last_mrl_source, old_old_src);
 	return;
       }
       
--- src/xitk/xine-toolkit/mrlbrowser.h
+++ src/xitk/xine-toolkit/mrlbrowser.h
@@ -59,7 +59,7 @@
   if((s)->origin) {                                                           \
     if((d)->origin) {                                                         \
       (d)->origin = (char *) realloc((d)->origin, strlen((s)->origin) + 1);   \
-      sprintf((d)->origin, "%s", (s)->origin);                                \
+      strcpy((d)->origin, (s)->origin);                                	      \
     }                                                                         \
     else                                                                      \
       (d)->origin = strdup((s)->origin);                                      \
@@ -70,7 +70,7 @@
   if((s)->mrl) {                                                              \
     if((d)->mrl) {                                                            \
       (d)->mrl = (char *) realloc((d)->mrl, strlen((s)->mrl) + 1);            \
-      sprintf((d)->mrl, "%s", (s)->mrl);                                      \
+      strcpy((d)->mrl, (s)->mrl);                                      	      \
     }                                                                         \
     else                                                                      \
       (d)->mrl = strdup((s)->mrl);                                            \
@@ -81,7 +81,7 @@
   if((s)->link) {                                                             \
     if((d)->link) {                                                           \
       (d)->link = (char *) realloc((d)->link, strlen((s)->link) + 1);         \
-      sprintf((d)->link, "%s", (s)->link);                                    \
+      strcpy((d)->link, (s)->link);                                    	      \
     }                                                                         \
     else                                                                      \
       (d)->link = strdup((s)->link);                                          \
--- src/xitk/xine-toolkit/skin.c
+++ src/xitk/xine-toolkit/skin.c
@@ -119,10 +119,9 @@
 
     if(strchr(cmd, '$')) {
 
-      memset(&buf, 0, sizeof(buf));
       snprintf(buf, sizeof(buf), "%s", cmd);
 
-      memset(&buf2, 0, sizeof(buf2));
+      buf2[0] = 0;
       
       p = buf;
 
@@ -149,44 +148,45 @@
 		snprintf(ppath, sizeof(ppath), "%s", skonfig->path);
 		if((z = strrchr(ppath, '/')) != NULL) {
 		  *z = '\0';
-		  sprintf(buf2, "%s%s", buf2, ppath);
+		  strcat(buf2, ppath);
 		}
 	      }
 	    }
 	    else if(!strncmp("SKIN_VERSION", var, strlen(var))) {
 	      if(skonfig->version >= 0)
-		sprintf(buf2, "%s%d", buf2, skonfig->version);
+		sprintf(buf2+strlen(buf2), "%d", skonfig->version);
 	    }
 	    else if(!strncmp("SKIN_AUTHOR", var, strlen(var))) {
 	      if(skonfig->author)
-		sprintf(buf2, "%s%s", buf2, skonfig->author);
+		strcat(buf2, skonfig->author);
 	    }
 	    else if(!strncmp("SKIN_PATH", var, strlen(var))) {
 	      if(skonfig->path)
-		sprintf(buf2, "%s%s", buf2, skonfig->path);
+		strcat(buf2, skonfig->path);
 	    }
 	    else if(!strncmp("SKIN_NAME", var, strlen(var))) {
 	      if(skonfig->name)
-		sprintf(buf2, "%s%s", buf2, skonfig->name);
+		strcat(buf2, skonfig->name);
 	    }
 	    else if(!strncmp("SKIN_DATE", var, strlen(var))) {
 	      if(skonfig->date)
-		sprintf(buf2, "%s%s", buf2, skonfig->date);
+		strcat(buf2, skonfig->date);
 	    }
 	    else if(!strncmp("SKIN_URL", var, strlen(var))) {
 	      if(skonfig->url)
-		sprintf(buf2, "%s%s", buf2, skonfig->url);
+		strcat(buf2, skonfig->url);
 	    }
 	    else if(!strncmp("HOME", var, strlen(var))) {
 	      if(skonfig->url)
-		sprintf(buf2, "%s%s", buf2, xitk_get_homedir());
+		strcat(buf2, xitk_get_homedir());
 	    }
 	    /* else ignore */
 	  }
 	  break;
 	  
 	default:
-	  sprintf(buf2, "%s%c", buf2, *p);
+	  buf2[strlen(buf2) + 1] = 0;
+	  buf2[strlen(buf2)] = *p;
 	  break;
 	}
 	p++;
--- src/xitk/xine-toolkit/xitk.c
+++ src/xitk/xine-toolkit/xitk.c
@@ -1853,7 +1853,7 @@
 	    gXitk->use_xshm = 0;
 	  else {
 	    XShmDetach(display, &shminfo);
-	    sprintf(buffer, "%s%s", buffer, "[XShm]");
+	    strcat(buffer, "[XShm]");
 	  }
 	  
 	  XDestroyImage(xim);
@@ -1869,12 +1869,12 @@
 #endif
 
 #ifdef WITH_XFT
-  sprintf(buffer, "%s%s", buffer, "[XFT]");
+  strcat(buffer, "[XFT]");
 #elif defined(WITH_XMB)
-  sprintf(buffer, "%s%s", buffer, "[XMB]");
+  strcat(buffer, "[XMB]");
 #endif
   
-  sprintf(buffer, "%s%s", buffer, " ]-");
+  strcat(buffer, " ]-");
 
   if(verbosity)
     printf("%s", buffer);

Places

File xine-ui-sprintf-COMMITTED.diff of Package xine-ui (Revision 3dc8ffc008148740e1ee8f9363f5d521)

Places