Changeset e7bcc6803fe92f02df716b748ba0d766366e7352

Show
Ignore:
Timestamp:
21/11/06 13:46:06 (2 years ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1164113166 +0000
git-parent:

[8808f2f00382381aee410f4b6af310920fe3f217]

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

Revert broken [17908:17910]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/extras/libc.c

    rcec120d re7bcc68  
    417417    } 
    418418 
    419     wchar_t wpath[MAX_PATH + 1]; 
    420  
    421     if (!MultiByteToWideChar (CP_UTF8, 0, psz_path, -1, wpath, MAX_PATH)) 
    422         return NULL; 
    423     wpath[MAX_PATH] = L'\0'; 
    424     p_real_dir = _wopendir( wpath ); 
    425  
     419    p_real_dir = opendir( psz_path ); 
    426420    if ( p_real_dir == NULL ) 
    427421        return NULL; 
    …… 
    451445            return &p_dir->dd_dir; 
    452446        } 
    453          
    454         return _wreaddir( p_dir->p_real_dir ); 
     447 
     448        return readdir( p_dir->p_real_dir ); 
    455449    } 
    456450 
    …… 
    478472    if ( p_dir->p_real_dir != NULL ) 
    479473    { 
    480         int i_ret = _wclosedir( p_dir->p_real_dir ); 
     474        int i_ret = closedir( p_dir->p_real_dir ); 
    481475        free( p_dir ); 
    482476        return i_ret; 

  • src/misc/unicode.c

    r08936b3 re7bcc68  
    430430void *utf8_opendir( const char *dirname ) 
    431431{ 
    432  
    433 #if defined (UNDER_CE) || defined (WIN32) 
    434     DIR *dir = vlc_opendir_wrapper( dirname ); 
    435     return dir; 
    436 #else 
     432    /* TODO: support for WinNT non-ACP filenames */ 
    437433    const char *local_name = ToLocale( dirname ); 
    438434 
    …… 
    445441    else 
    446442        errno = ENOENT; 
    447 #endif 
    448  
    449443    return NULL; 
    450444} 
    …… 
    459453        return NULL; 
    460454 
    461 #if defined (UNDER_CE) || defined (WIN32) 
    462     return FromWide(ent->d_name); 
    463 #else 
    464455    return vlc_fix_readdir( ent->d_name ); 
    465 #endif 
    466456} 
    467457