*** ./src/text/filesystem.c.old	2009-07-31 12:45:48.000000000 +0900
--- ./src/text/filesystem.c	2009-07-31 12:46:17.000000000 +0900
***************
*** 276,282 ****
--- 276,297 ----
      if( ent == NULL )
          return NULL;
  
+ #ifdef ORIGINAL_CODE
      return vlc_fix_readdir( ent->d_name );
+ #else
+     {
+     	const char *utf8_name = FromLocale( ent->d_name );
+ 
+ 	if (utf8_name != NULL)
+ 	{
+                 char *result_name = vlc_fix_readdir ( utf8_name );
+ 		LocaleFree (utf8_name);
+ 		return result_name;
+ 	}
+ 	else
+     		return vlc_fix_readdir( ent->d_name );
+     }
+ #endif
  #endif
  }
  
*** ./modules/access/dvdnav.c.old	2009-07-31 23:09:17.000000000 +0900
--- ./modules/access/dvdnav.c	2009-07-31 23:13:40.000000000 +0900
***************
*** 1447,1453 ****
--- 1447,1457 ----
      if( !strcmp( psz_name, "-" ) ) /* stdin -> file access */
          return VLC_EGENERIC;
  
+ #ifdef	ORIGINAL_CODE
      if( (i_fd = utf8_open( psz_name, O_RDONLY |O_NONBLOCK, 0666 )) == -1 )
+ #else
+     if( (i_fd = open( psz_name, O_RDONLY |O_NONBLOCK, 0666 )) == -1 )
+ #endif
      {
          return VLC_SUCCESS; /* Let dvdnav_open() do the probing */
      }