Changeset ab8bf7fc2883288d46310a11bd47f3f47219c913

Show
Ignore:
Timestamp:
14/03/07 18:32:24 (2 years ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1173893544 +0000
git-parent:

[92871bdc8c5dd8c8a5b47f8da65a551133972399]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1173893544 +0000
Message:

Remove too late and partial command line charset conversion - refs #838
Note that this provisionaly breaks the command line
on non-UTF-8 non-Win32 systems

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/libvlc-common.c

    r92871bd rab8bf7f  
    12091209    for( i_opt = i_argc - 1; i_opt >= optind; i_opt-- ) 
    12101210    { 
    1211         const char *psz_target; 
    12121211        i_options = 0; 
    12131212 
     
    12221221         *       unnecessary lookups. */ 
    12231222 
    1224 #ifdef WIN32 
    1225         if( GetVersion() < 0x80000000 ) 
    1226         { 
    1227             VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[i_opt], 
     1223        VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[i_opt], 
    12281224                       (char const **)( i_options ? &ppsz_argv[i_opt + 1] : 
    12291225                                        NULL ), i_options, 
    12301226                       PLAYLIST_INSERT, 0 ); 
    1231         } 
    1232         else 
    1233 #endif 
    1234         { 
    1235             /* FIXME: it's too late to call FromLocale here. We should 
    1236                convert ALL arguments to UTF8 before they get parsed */ 
    1237  
    1238             psz_target = FromLocale( ppsz_argv[ i_opt ] ); 
    1239             VLC_AddTarget( p_vlc->i_object_id, psz_target, 
    1240                        (char const **)( i_options ? &ppsz_argv[i_opt + 1] : 
    1241                                         NULL ), i_options, 
    1242                        PLAYLIST_INSERT, 0 ); 
    1243             LocaleFree( psz_target ); 
    1244         } 
    12451227    } 
    12461228