Menu
▾
▴
[xine-cvs] CVS: xine-ui/src/xitk actions.c, 1.283, 1.284 file_browser.c, 1.73, 1.74 kbindings.c, 1.146, 1.147 main.c, 1.338, 1.339 mediamark.c, 1.113, 1.114 network.c, 1.77, 1.78 osd.c, 1.43, 1.44 panel.c, 1.229, 1.230 post.c, 1.65, 1.66 skins.c, 1.82, 1.83 snapshot.c, 1.36, 1.37 videowin.c, 1.230, 1.231
|
From: <dg...@us...> - 2008-01-13 19:35:09
|
Update of /cvsroot/xine/xine-ui/src/xitk In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3293/src/xitk Modified Files: actions.c file_browser.c kbindings.c main.c mediamark.c network.c osd.c panel.c post.c skins.c snapshot.c videowin.c Log Message: Replace instances where s(n)printf was used with just %s as format string with str(n)cpy or other alternatives. Index: actions.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/actions.c,v retrieving revision 1.283 retrieving revision 1.284 diff -u -r1.283 -r1.284 --- actions.c 13 Jan 2008 18:12:49 -0000 1.283 +++ actions.c 13 Jan 2008 19:35:08 -0000 1.284 @@ -853,7 +853,7 @@ len = (mrl - cur_mrl) + 3; tok = (char *) alloca(len); - snprintf(tok, len, "%s", cur_mrl); + strncpy(tok, cur_mrl, len-1); } if(tok != NULL) { @@ -1388,7 +1388,7 @@ /* file don't exist, add it anyway */ if((stat(buffer2, &pstat)) == -1) - snprintf(buffer, sizeof(buffer), "%s", mrl); + strncpy(buffer, mrl, sizeof(buffer)-1); else { if(is_a_dir(buffer2)) { @@ -1411,7 +1411,7 @@ } } else - snprintf(buffer, sizeof(buffer), "%s", mrl); + strncpy(buffer, mrl, sizeof(buffer)-1); if(is_a_dir(buffer)) { if(buffer[strlen(buffer) - 1] == '/') @@ -2069,7 +2069,7 @@ if(fb == load_stream) { if(cur_dir && strlen(cur_dir)) { - snprintf(gGui->curdir, sizeof(gGui->curdir), "%s", cur_dir); + strncpy(gGui->curdir, cur_dir, sizeof(gGui->curdir)-1); config_update_string("media.files.origin_path", gGui->curdir); } load_stream = NULL; @@ -2087,7 +2087,7 @@ /* Upate configuration with the selected directory path */ if(cur_dir && strlen(cur_dir)) { - snprintf(gGui->curdir, sizeof(gGui->curdir), "%s", cur_dir); + strncpy(gGui->curdir, cur_dir, sizeof(gGui->curdir)-1); config_update_string("media.files.origin_path", gGui->curdir); } @@ -2139,7 +2139,7 @@ /* Update the configuration with the current path */ if(path && strlen(path)) { - snprintf(gGui->curdir, sizeof(gGui->curdir), "%s", path); + strncpy(gGui->curdir, path, sizeof(gGui->curdir)-1); config_update_string("media.files.origin_path", gGui->curdir); } @@ -2157,7 +2157,7 @@ if(strcasecmp(path, "/")) snprintf(pathname, sizeof(pathname), "%s/", path); else - snprintf(pathname, sizeof(pathname), "%s", path); + strncpy(pathname, path, sizeof(pathname)-1); /* For each file, concatenate the path with the name and append it to the playlist */ while(files[i]) { Index: file_browser.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/file_browser.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- file_browser.c 14 Nov 2007 20:32:35 -0000 1.73 +++ file_browser.c 13 Jan 2008 19:35:08 -0000 1.74 @@ -470,7 +470,7 @@ if((*filepathname == '\\') && (*(filepathname + 1) == '~')) filepathname++; if((*filepathname == '/')) - snprintf(_filepathname, sizeof(_filepathname), "%s", filepathname); + strncpy(_filepathname, filepathname, sizeof(_filepathname)-1); else snprintf(_filepathname, sizeof(_filepathname), "%s/%s", fb->current_dir, filepathname); } @@ -506,10 +506,10 @@ } if(dirname) - snprintf(fb->current_dir, sizeof(fb->current_dir), "%s", dirname); + strncpy(fb->current_dir, dirname, sizeof(fb->current_dir)-1); if(filename) - snprintf(fb->filename, sizeof(fb->filename), "%s", filename); + strncpy(fb->filename, filename, sizeof(fb->filename)-1); else *fb->filename = '\0'; } @@ -766,7 +766,7 @@ filebrowser_t *fb = (filebrowser_t *) data; if(w == fb->files_browser) { - snprintf(fb->filename, sizeof(fb->filename), "%s", fb->norm_files[selected].name); + strncpy(fb->filename, fb->norm_files[selected].name, sizeof(fb->filename)-1); fb_update_origin(fb); } } @@ -802,7 +802,7 @@ else if(!strcasecmp(fb->dir_files[selected].name, "..")) { char *p; - snprintf(buf, sizeof(buf), "%s", fb->current_dir); + strncpy(buf, fb->current_dir, sizeof(buf)-1); if(strlen(buf) > 1) { /* not '/' directory */ p = &buf[strlen(buf)-1]; @@ -815,7 +815,7 @@ if((strlen(buf) > 1) && *p == '/') *p = '\0'; - snprintf(fb->current_dir, sizeof(fb->current_dir), "%s", buf); + strncpy(fb->current_dir, buf, sizeof(fb->current_dir)-1); } } else { @@ -829,7 +829,7 @@ } if(is_a_dir(buf)) - snprintf(fb->current_dir, sizeof(fb->current_dir), "%s", buf); + strncpy(fb->current_dir, buf, sizeof(fb->current_dir)-1); } @@ -837,7 +837,7 @@ fb_getdir(fb); } else if(w == fb->files_browser) { - snprintf(fb->filename, sizeof(fb->filename), "%s", fb->norm_files[selected].name); + strncpy(fb->filename, fb->norm_files[selected].name, sizeof(fb->filename)-1); fb_callback_button_cb(fb->cb_buttons[0], (void *)data); } @@ -1226,7 +1226,7 @@ fb->hidden_cb = hidden_cb; fb->show_hidden_files = hidden_cb(0, 0); - snprintf(fb->current_dir, sizeof(fb->current_dir), "%s", xine_get_homedir()); + strncpy(fb->current_dir, xine_get_homedir(), sizeof(fb->current_dir)-1); memset(&fb->filename, 0, sizeof(fb->filename)); fb_extract_path_and_file(fb, filepathname); Index: kbindings.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/kbindings.c,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- kbindings.c 10 Jan 2008 00:06:01 -0000 1.146 +++ kbindings.c 13 Jan 2008 19:35:08 -0000 1.147 @@ -1566,7 +1566,7 @@ if(kbedit->kbt->entry[i]->is_alias) snprintf(buf, sizeof(buf), "@{%s}", kbedit->kbt->entry[i]->comment); else - snprintf(buf, sizeof(buf), "%s", kbedit->kbt->entry[i]->comment); + strncpy(buf, kbedit->kbt->entry[i]->comment, sizeof(buf)-1); kbedit->entries[i] = strdup(buf); kbedit->shortcuts[i] = strdup(shortcut); Index: main.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/main.c,v retrieving revision 1.338 retrieving revision 1.339 diff -u -r1.338 -r1.339 --- main.c 13 Jan 2008 17:49:20 -0000 1.338 +++ main.c 13 Jan 2008 19:35:08 -0000 1.339 @@ -1125,60 +1125,60 @@ /* (host name) */ case XINE_MSG_UNKNOWN_HOST: - snprintf(buffer, sizeof(buffer), "%s", _("The host you're trying to connect is unknown.\n" - "Check the validity of the specified hostname.")); + strncpy(buffer, _("The host you're trying to connect is unknown.\n" + "Check the validity of the specified hostname."), sizeof(buffer)-1); if(data->explanation) snprintf(buffer+strlen(buffer), sizeof(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.")); + strncpy(buffer, _("The device name you specified seems invalid."), sizeof(buffer)-1); if(data->explanation) snprintf(buffer+strlen(buffer), sizeof(buffer)-strlen(buffer), " (%s)", (char *) data + data->parameters); break; /* none */ case XINE_MSG_NETWORK_UNREACHABLE: - snprintf(buffer, sizeof(buffer), "%s", _("The network looks unreachable.\nCheck your network " - "setup and/or the server name.")); + strncpy(buffer, _("The network looks unreachable.\nCheck your network " + "setup and/or the server name."), sizeof(buffer)-1); if(data->explanation) snprintf(buffer+strlen(buffer), sizeof(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.")); + strncpy(buffer, _("The connection was refused.\nCheck the host name."), sizeof(buffer)-1); if(data->explanation) snprintf(buffer+strlen(buffer), sizeof(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 could not be found. Please check it twice.")); + strncpy(buffer, _("The specified file or MRL could not be found. Please check it twice."), sizeof(buffer)-1); if(data->explanation) snprintf(buffer+strlen(buffer), sizeof(buffer)-strlen(buffer), " (%s)", (char *) data + data->parameters); break; /* (device/file/mrl) */ case XINE_MSG_READ_ERROR: - snprintf(buffer, sizeof(buffer), "%s", _("The source can't be read.\nMaybe you don't have enough " - "rights for this, or source doesn't contain data " - "(e.g: not disc in drive).")); + strncpy(buffer, _("The source can't be read.\nMaybe you don't have enough " + "rights for this, or source doesn't contain data " + "(e.g: not disc in drive)."), sizeof(buffer)-1); if(data->explanation) snprintf(buffer+strlen(buffer), sizeof(buffer)-strlen(buffer), " (%s)", (char *) data + data->parameters); break; /* (library/decoder) */ case XINE_MSG_LIBRARY_LOAD_ERROR: - snprintf(buffer, sizeof(buffer), "%s", _("A problem occurred while loading a library or a decoder")); + strncpy(buffer, _("A problem occurred while loading a library or a decoder"), sizeof(buffer)-1); if(data->explanation) snprintf(buffer+strlen(buffer), sizeof(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.")); + strncpy(buffer, _("The source seems encrypted, and can't be read."), sizeof(buffer)-1); if(!strncasecmp(gGui->mmk.mrl, "dvd:/", 5)) { strlcat(buffer, _("\nYour DVD is probably crypted. " "According to your country laws, you can or can't " @@ -1195,17 +1195,17 @@ if(data->explanation) snprintf(buffer, sizeof(buffer), "%s %s", (char *) data + data->explanation, (char *) data + data->parameters); else - snprintf(buffer, sizeof(buffer), "%s", _("No information available.")); + strncpy(buffer, _("No information available."), sizeof(buffer)-1); break; case XINE_MSG_AUDIO_OUT_UNAVAILABLE: gui_stop(NULL, NULL); - snprintf(buffer, sizeof(buffer), "%s", _("The audio device is unavailable. " - "Please verify if another program already uses it.")); + strncpy(buffer, _("The audio device is unavailable. " + "Please verify if another program already uses it."), sizeof(buffer)-1); break; default: - snprintf(buffer, sizeof(buffer), "%s", _("*sight*, unkown error.")); + strncpy(buffer, _("*sight*, unkown error."), sizeof(buffer)-1); if(data->explanation) snprintf(buffer+strlen(buffer), sizeof(buffer)-strlen(buffer), " (%s %s)", (char *) data + data->explanation, (char *) data + data->parameters); break; @@ -2045,7 +2045,7 @@ xine_cfg_entry_t cfg_entry; if(xine_config_lookup_entry(gGui->xine, "media.files.origin_path", &cfg_entry)) - snprintf(gGui->curdir, sizeof(gGui->curdir), "%s", cfg_entry.str_value); + strncpy(gGui->curdir, cfg_entry.str_value, sizeof(gGui->curdir)-1); else getcwd(&(gGui->curdir[0]), XITK_PATH_MAX); } Index: mediamark.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/mediamark.c,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- mediamark.c 24 Dec 2007 12:44:40 -0000 1.113 +++ mediamark.c 13 Jan 2008 19:35:08 -0000 1.114 @@ -552,7 +552,7 @@ entry = ln; if(origin) { - snprintf(buffer1, sizeof(buffer1), "%s", origin); + strncpy(buffer1, origin, sizeof(buffer1)-1); if((buffer1[strlen(buffer1) - 1] == '/') && (*ln == '/')) buffer1[strlen(buffer1) - 1] = '\0'; @@ -671,7 +671,7 @@ entry = ln; if(origin) { - snprintf(buffer1, sizeof(buffer1), "%s", origin); + strncpy(buffer1, origin, sizeof(buffer1)-1); if((buffer1[strlen(buffer1) - 1] == '/') && (*ln == '/')) buffer1[strlen(buffer1) - 1] = '\0'; @@ -763,7 +763,7 @@ entry = ln; if(origin) { - snprintf(buffer1, sizeof(buffer1), "%s", origin); + strncpy(buffer1, origin, sizeof(buffer1)-1); if((buffer1[strlen(buffer1) - 1] == '/') && (*ln == '/')) buffer1[strlen(buffer1) - 1] = '\0'; @@ -2558,7 +2558,7 @@ if(!strncasecmp(_mrl, "file:", 5)) _mrl += 5; - snprintf(autosub, sizeof(autosub), "%s", _mrl); + strncpy(autosub, _mrl, sizeof(autosub)-1); if((ending = strrchr(autosub, '.'))) ending++; @@ -2570,7 +2570,7 @@ vsubs = strdup(know_subs); while((ext = xine_strsep(&vsubs, ",")) && !sub) { - sprintf(ending, "%s", ext); + strcpy(ending, ext); *(ending + strlen(ext) + 1) = '\0'; if(((stat(autosub, &pstat)) > -1) && (S_ISREG(pstat.st_mode)) && strcmp(autosub, _mrl)) @@ -3172,7 +3172,7 @@ static void mmk_fileselector_callback(filebrowser_t *fb) { char *file; - snprintf(gGui->curdir, sizeof(gGui->curdir), "%s", (filebrowser_get_current_dir(fb))); + strncpy(gGui->curdir, filebrowser_get_current_dir(fb), sizeof(gGui->curdir)-1); if((file = filebrowser_get_full_filename(fb)) != NULL) { if(file) Index: network.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/network.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- network.c 13 Nov 2007 21:12:18 -0000 1.77 +++ network.c 13 Jan 2008 19:35:08 -0000 1.78 @@ -669,18 +669,13 @@ #endif static void session_update_prompt(session_t *session) { - char buf[514]; - if(session == NULL) return; - if(session->socket >= 0) { - snprintf(buf, sizeof(buf), "%s:%s", session->host, session->port); - } + if(session->socket >= 0) + snprintf(session->prompt, sizeof(session->prompt), "[%s:%s]"PROGNAME" >", session->host, session->port, PROGNAME); else - snprintf(buf, sizeof(buf), "%s", "******:****"); - - snprintf(session->prompt, sizeof(session->prompt), "[%s]%s >", buf, PROGNAME); + strncpy(session->prompt, "[******:****]"PROGNAME" >", sizeof(session->prompt)); } static void session_create_commands(session_t *session) { @@ -726,13 +721,11 @@ int i = 0; size_t maxlen = 0, j; int curpos = 0; - char buf[_BUFSIZ]; + char buf[_BUFSIZ] = "Available commands are:\n "; if((session == NULL) || (command == NULL)) return; - memset(&buf, 0, sizeof(buf)); - while(session_commands[i]->command != NULL) { if(session_commands[i]->enable) { @@ -746,7 +739,6 @@ maxlen++; i = 0; - snprintf(buf, sizeof(buf), "%s", "Available commands are:\n "); curpos += 7; while(session_commands[i]->command != NULL) { @@ -810,7 +802,7 @@ } if(cmd) { - snprintf(buf, sizeof(buf), "%s", cmd); + strncpy(buf, cmd, sizeof(buf)-1); pbuf = buf; if((p = strchr(pbuf, ' ')) != NULL) { host = _atoa(p); @@ -828,10 +820,10 @@ if(host != NULL) { - snprintf(session->host, sizeof(session->host), "%s", host); + strncpy(session->host, host, sizeof(session->host)-1); if(port != NULL) - snprintf(session->port, sizeof(session->port), "%s", port); + strncpy(session->port, port, sizeof(session->port)-1); session_create_commands(session); session->socket = sock_client(session->host, session->port, "tcp"); @@ -1040,8 +1032,7 @@ return; /* Get only first arg of command */ - memset(&cmd, 0, sizeof(cmd)); - snprintf(cmd, sizeof(cmd), "%s", command); + strncpy(cmd, command, sizeof(cmd)-1); if((p = strchr(cmd, ' ')) != NULL) *p = '\0'; @@ -1205,8 +1196,8 @@ session.socket = -1; pthread_mutex_init(&session.console_mutex, NULL); - snprintf(session.host, sizeof(session.host), "%s", DEFAULT_SERVER); - snprintf(session.port, sizeof(session.port), "%s", DEFAULT_XINECTL_PORT); + strcpy(session.host, DEFAULT_SERVER); + strcpy(session.prot, DEFAULT_XINECTL_PORT); opterr = 0; while((c = getopt_long(argc, argv, short_options, long_options, &option_index)) != EOF) { @@ -1214,13 +1205,13 @@ case 'H': /* Set host */ if(optarg != NULL) - snprintf(session.host, sizeof(session.host), "%s", optarg); + strncpy(session.host, optarg, sizeof(session.host)-1); break; case 'P': /* Set port */ if(optarg != NULL) { port_set = 1; - snprintf(session.port, sizeof(session.port), "%s", optarg); + strncpy(session.port, optarg, sizeof(session.port)-1); } break; @@ -1439,7 +1430,7 @@ char buf[_BUFSIZ]; char *n, *p; - snprintf(buf, sizeof(buf), "%s", entry); + strncpy(buf, entry, sizeof(buf)-1); n = buf; if((p = strrchr(buf, ':')) != NULL) { if(strlen(p) > 1) { @@ -1453,8 +1444,8 @@ } if((n != NULL) && (p != NULL)) { - snprintf(name, MAX_NAME_LEN, "%s", n); - snprintf(passwd, MAX_PASSWD_LEN, "%s", p); + strncpy(name, n, MAX_NAME_LEN-1); + strncpy(passwd, p, MAX_PASSWD_LEN-1); return 1; } @@ -1725,7 +1716,7 @@ } static void do_help(commands_t *cmd, client_info_t *client_info) { - char buf[_BUFSIZ]; + char buf[_BUFSIZ] = "Available commands are:\n "; if(!client_info->command.num_args) { int i = 0; @@ -1745,7 +1736,6 @@ maxlen++; i = 0; - snprintf(buf, sizeof(buf), "%s", "Available commands are:\n "); curpos += 7; while(commands[i].command != NULL) { @@ -1806,7 +1796,7 @@ char *name; char *passwd; - snprintf(buf, sizeof(buf), "%s", get_arg(client_info, 1)); + strncpy(buf, get_arg(client_info, 1), sizeof(buf)-1); name = buf; if((passwd = strrchr(buf, ':')) != NULL) { if(strlen(passwd) > 1) { @@ -1822,8 +1812,8 @@ memset(&client_info->name, 0, sizeof(client_info->name)); memset(&client_info->passwd, 0, sizeof(client_info->passwd)); - snprintf(client_info->name, sizeof(client_info->name), "%s", name); - snprintf(client_info->passwd, sizeof(client_info->passwd), "%s", passwd); + strncpy(client_info->name, name, sizeof(client_info->name)-1); + strncpy(client_info->passwd, passwd, sizeof(client_info->passwd)-1); check_client_auth(client_info); } @@ -2144,9 +2134,7 @@ sock_write(client_info->socket, "%s", buf); } else if(is_arg_contain(client_info, 1, "loop")) { - char buf[64]; - - snprintf(buf, sizeof(buf), "%s", "Current loop mode is: "); + char buf[64] = "Current loop mode is: "; switch(gGui->playlist.loop) { case PLAYLIST_LOOP_NO_LOOP: @@ -2725,8 +2713,8 @@ strlen(client_info->command.line) - strlen(cmd) + 1); memset(client_info->command.command, 0, sizeof(client_info->command.command)); - snprintf(client_info->command.command, - (strlen(client_info->command.line) - strlen(cmd))+1, "%s", client_info->command.line); + strncpy(client_info->command.command, client_info->command.line, + (strlen(client_info->command.line) - strlen(cmd))); cmd = _atoa(cmd); Index: osd.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/osd.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- osd.c 13 Jan 2008 17:56:00 -0000 1.43 +++ osd.c 13 Jan 2008 19:35:08 -0000 1.44 @@ -332,7 +332,7 @@ y = x = 0; - snprintf(buffer, sizeof(buffer), "%s", (gGui->is_display_mrl) ? gGui->mmk.mrl : gGui->mmk.ident); + strncpy(buffer, (gGui->is_display_mrl) ? gGui->mmk.mrl : gGui->mmk.ident, sizeof(buffer)-1); xine_osd_get_text_size(gGui->osd.sinfo.osd[0], buffer, &osdw, &h); p = buffer; while(osdw > (wwidth - 40)) { @@ -633,7 +633,7 @@ switch(status) { case XINE_STATUS_IDLE: case XINE_STATUS_STOP: - snprintf(buffer, sizeof(buffer), "%s", (_osd_get_status_sym(status))); + strncpy(buffer, _osd_get_status_sym(status), sizeof(buffer)-1); break; case XINE_STATUS_PLAY: @@ -648,7 +648,7 @@ secs / (60*60), (secs / 60) % 60, secs % 60); } else - snprintf(buffer, sizeof(buffer), "%s", (_osd_get_speed_sym(speed))); + strncpy(buffer, _osd_get_speed_sym(speed), sizeof(buffer)-1); } break; Index: panel.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/panel.c,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- panel.c 24 Dec 2007 12:44:40 -0000 1.229 +++ panel.c 13 Jan 2008 19:35:08 -0000 1.230 @@ -328,7 +328,7 @@ } else if(remain < 0) - snprintf(timestr, sizeof(timestr), "%s", " : : "); + strcpy(timestr, " : : "); else { if(rdays > 0) snprintf(timestr, sizeof(timestr), "% 4d::%02d", rdays, remain / (60*60)); @@ -338,7 +338,7 @@ } else - snprintf(timestr, sizeof(timestr), "%s", "--:--:--"); + strcpy(timestr, "--:--:--"); if(length > 0) { int days; Index: post.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/post.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- post.c 24 Dec 2007 12:44:41 -0000 1.65 +++ post.c 13 Jan 2008 19:35:08 -0000 1.66 @@ -616,7 +616,7 @@ if(pobj->param->type == POST_PARAM_TYPE_CHAR) { int maxlen = pobj->param->size / sizeof(char); - snprintf((char *)(pobj->param_data + pobj->param->offset), maxlen, "%s", text); + strncpy((char *)(pobj->param_data + pobj->param->offset), text, maxlen); _pplugin_update_parameter(pobj); xitk_inputtext_change_text(pobj->value, (char *)(pobj->param_data + pobj->param->offset)); } @@ -2241,7 +2241,7 @@ if(pobj.param->type == POST_PARAM_TYPE_CHAR) { int maxlen = pobj.param->size / sizeof(char); - snprintf((char *)(pobj.param_data + pobj.param->offset), maxlen, "%s", p); + strncpy((char *)(pobj.param_data + pobj.param->offset), p, maxlen); _pplugin_update_parameter(&pobj); } else Index: skins.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/skins.c,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- skins.c 13 Jan 2008 17:06:41 -0000 1.82 +++ skins.c 13 Jan 2008 19:35:08 -0000 1.83 @@ -917,7 +917,7 @@ xine_system(0, buffer); unlink(tmpskin); - snprintf(buffer, ((strlen(filename) + 1) - 7), "%s", filename); + strncpy(buffer, filename, ((strlen(filename) + 1) - 7)); snprintf(fskin_path, sizeof(fskin_path), "%s/%s/%s", skindir, buffer, "doinst.sh"); if(is_a_file(fskin_path)) { Index: snapshot.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/snapshot.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- snapshot.c 13 Jan 2008 17:33:33 -0000 1.36 +++ snapshot.c 13 Jan 2008 19:35:09 -0000 1.37 @@ -690,7 +690,7 @@ p++; - snprintf(basename, sizeof(basename), "%s", p); + strncpy(basename, p, sizeof(basename)-1); if((ext = strrchr(basename, '.')) != NULL) *ext = '\0'; Index: videowin.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/videowin.c,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- videowin.c 13 Jan 2008 18:34:21 -0000 1.230 +++ videowin.c 13 Jan 2008 19:35:09 -0000 1.231 @@ -1541,7 +1541,7 @@ gVw->fake_key_cur = 0; #endif - snprintf(gVw->window_title, sizeof(gVw->window_title), "%s", "xine"); + strcpy(gVw->window_title, "xine"); gettimeofday(&gVw->click_time, 0); |