else
path[done++] = paths[i];
}
- path[done++] = 0;
+ path[done] = 0;
/* Return the remaining paths */
if( remaining_paths ) {
static void AllocatePluginDir( vlc_object_t *p_this, module_bank_t *p_bank,
const char *psz_dir, unsigned i_maxdepth )
{
-/* FIXME: Needs to be ported to wide char on ALL Windows builds */
-#ifdef WIN32
-# undef opendir
-# undef closedir
-# undef readdir
-#endif
-#if defined( UNDER_CE ) || defined( _MSC_VER )
-#ifdef UNDER_CE
- wchar_t psz_wpath[MAX_PATH + 256];
- wchar_t psz_wdir[MAX_PATH];
-#endif
- char psz_path[MAX_PATH + 256];
- WIN32_FIND_DATA finddata;
- HANDLE handle;
- int rc;
-#else
- int i_dirlen;
- DIR * dir;
- struct dirent * file;
-#endif
- char * psz_file;
-
if( i_maxdepth == 0 )
return;
-#if defined( UNDER_CE ) || defined( _MSC_VER )
-#ifdef UNDER_CE
- MultiByteToWideChar( CP_ACP, 0, psz_dir, -1, psz_wdir, MAX_PATH );
-
- rc = GetFileAttributes( psz_wdir );
- if( rc<0 || !(rc&FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */
-
- /* Parse all files in the directory */
- swprintf( psz_wpath, L"%ls\\*", psz_wdir );
-#else
- rc = GetFileAttributes( psz_dir );
- if( rc<0 || !(rc&FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */
-#endif
-
- /* Parse all files in the directory */
- sprintf( psz_path, "%s\\*", psz_dir );
-
-#ifdef UNDER_CE
- handle = FindFirstFile( psz_wpath, &finddata );
-#else
- handle = FindFirstFile( psz_path, &finddata );
-#endif
- if( handle == INVALID_HANDLE_VALUE )
- {
- /* Empty directory */
+ DIR *dh = utf8_opendir (psz_dir);
+ if (dh == NULL)
return;
- }
/* Parse the directory and try to load all files it contains. */
- do
+ for (;;)
{
-#ifdef UNDER_CE
- unsigned int i_len = wcslen( finddata.cFileName );
- swprintf( psz_wpath, L"%ls\\%ls", psz_wdir, finddata.cFileName );
- sprintf( psz_path, "%s\\%ls", psz_dir, finddata.cFileName );
-#else
- unsigned int i_len = strlen( finddata.cFileName );
- sprintf( psz_path, "%s\\%s", psz_dir, finddata.cFileName );
-#endif
-
- /* Skip ".", ".." */
- if( !*finddata.cFileName || !strcmp( finddata.cFileName, "." )
- || !strcmp( finddata.cFileName, ".." ) )
- {
- if( !FindNextFile( handle, &finddata ) ) break;
- continue;
- }
+ char *file = utf8_readdir (dh), *path;
+ struct stat st;
-#ifdef UNDER_CE
- if( GetFileAttributes( psz_wpath ) & FILE_ATTRIBUTE_DIRECTORY )
-#else
- if( GetFileAttributes( psz_path ) & FILE_ATTRIBUTE_DIRECTORY )
-#endif
- {
- AllocatePluginDir( p_this, p_bank, psz_path, i_maxdepth - 1 );
- }
- else if( i_len > strlen( LIBEXT )
- /* We only load files ending with LIBEXT */
- && !strncasecmp( psz_path + strlen( psz_path)
- - strlen( LIBEXT ),
- LIBEXT, strlen( LIBEXT ) ) )
- {
- WIN32_FILE_ATTRIBUTE_DATA attrbuf;
- int64_t i_time = 0, i_size = 0;
-
-#ifdef UNDER_CE
- if( GetFileAttributesEx( psz_wpath, GetFileExInfoStandard,
- &attrbuf ) )
-#else
- if( GetFileAttributesEx( psz_path, GetFileExInfoStandard,
- &attrbuf ) )
-#endif
- {
- i_time = attrbuf.ftLastWriteTime.dwHighDateTime;
- i_time <<= 32;
- i_time |= attrbuf.ftLastWriteTime.dwLowDateTime;
- i_size = attrbuf.nFileSizeHigh;
- i_size <<= 32;
- i_size |= attrbuf.nFileSizeLow;
- }
- psz_file = psz_path;
-
- AllocatePluginFile( p_this, p_bank, psz_file, i_time, i_size );
- }
- }
- while( !p_this->p_libvlc->b_die && FindNextFile( handle, &finddata ) );
-
- /* Close the directory */
- FindClose( handle );
-
-#else
- dir = opendir( psz_dir );
- if( !dir )
- {
- return;
- }
-
- i_dirlen = strlen( psz_dir );
-
- /* Parse the directory and try to load all files it contains. */
- while( !p_this->p_libvlc->b_die && ( file = readdir( dir ) ) )
- {
- struct stat statbuf;
- unsigned int i_len;
- int i_stat;
+ if (file == NULL)
+ break;
/* Skip ".", ".." */
- if( !*file->d_name || !strcmp( file->d_name, "." )
- || !strcmp( file->d_name, ".." ) )
+ if (!strcmp (file, ".") || !strcmp (file, ".."))
{
+ free (file);
continue;
}
- i_len = strlen( file->d_name );
- psz_file = malloc( i_dirlen + 1 + i_len + 1 );
- sprintf( psz_file, "%s"DIR_SEP"%s", psz_dir, file->d_name );
-
- i_stat = stat( psz_file, &statbuf );
- if( !i_stat && statbuf.st_mode & S_IFDIR )
- {
- AllocatePluginDir( p_this, p_bank, psz_file, i_maxdepth - 1 );
- }
- else if( i_len > strlen( LIBEXT )
- /* We only load files ending with LIBEXT */
- && !strncasecmp( file->d_name + i_len - strlen( LIBEXT ),
- LIBEXT, strlen( LIBEXT ) ) )
- {
- int64_t i_time = 0, i_size = 0;
-
- if( !i_stat )
- {
- i_time = statbuf.st_mtime;
- i_size = statbuf.st_size;
- }
-
- AllocatePluginFile( p_this, p_bank, psz_file, i_time, i_size );
- }
+ const int pathlen = asprintf (&path, "%s"DIR_SEP"%s", psz_dir, file);
+ free (file);
+ if (pathlen == -1 || utf8_stat (path, &st))
+ continue;
- free( psz_file );
+ if (S_ISDIR (st.st_mode))
+ /* Recurse into another directory */
+ AllocatePluginDir (p_this, p_bank, path, i_maxdepth - 1);
+ else
+ if (S_ISREG (st.st_mode)
+ && ((size_t)pathlen >= strlen (LIBEXT))
+ && !strncasecmp (path + pathlen - strlen (LIBEXT), LIBEXT,
+ strlen (LIBEXT)))
+ /* ^^ We only load files ending with LIBEXT */
+ AllocatePluginFile (p_this, p_bank, path, st.st_mtime, st.st_size);
+
+ free (path);
}
-
- /* Close the directory */
- closedir( dir );
-
-#endif
+ closedir (dh);
}
/*****************************************************************************
projects / vlc / blobdiff