Changeset 128cbbabfd57761c125f35d64bae1f8ed83acfc4

Timestamp:

10/11/06 21:56:10 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1163192170 +0000

git-parent:

[69263809ad62332f167463d06cacad2504c47fda]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1163192170 +0000

Message:

Switch the directory to the UTF-8 wrappers

Files:

• modules/access/directory.c (modified) (14 diffs)

modules/access/directory.c

@@ -137 +137 @@
-    struct stat stat_info;
-
-HAVE_SYS_STAT_H
+S_ISDIR
-    if (utf8_stat (p_access->psz_path, &stat_info)
-     || !S_ISDIR (stat_info.st_mode))
@@ -179 +179 @@
-static int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
-{
-    char *psz_name = NULL;
-    char *psz;
-    char *ptr;
-    int  i_mode, i_activity;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-    /* Remove the ending '/' char */
-ptr += strlen( ptr );
-if( ( ptr > psz_name ) )
-{
-( *--ptr 
+if (psz_name[0])
+{
+    char *ptr = psz_name + strlen (psz_name);
+ (*--ptr
-        {
-            case '/':
@@ -206 +197 @@
-        }
-    }
+
+    playlist_item_t *p_item, *p_root_category;
+    playlist_t *p_playlist = pl_Yield( p_access );
-
-    /* Handle mode */
@@ -241 +235 @@
-                    DIRECTORY_ACTIVITY );
-
- 
+
-
-    i_activity = var_GetInteger( p_playlist, "activity" );
-    var_SetInteger( p_playlist, "activity", i_activity -
-                    DIRECTORY_ACTIVITY );
-end:
-    if( psz_name ) free( psz_name );
-    vlc_object_release( p_playlist );
@@ -332 +325 @@
-}
-
-
-
-
+
+
+
+
-}
-
@@ -344 +338 @@
-                    playlist_item_t *p_parent_category )
-{
-struct dirent   **pp_dir_content = 0
+char **pp_dir_content = NULL
-    int             i_dir_content, i, i_return = VLC_SUCCESS;
-    playlist_item_t *p_node;
-
-0
+NULL
-    int i_extensions = 0;
-    char *psz_ignore;
-
-    /* Get the first directory entry */
-scandir( psz_name, &pp_dir_content, Filter, alphasort 
+utf8_scandir (psz_name, &pp_dir_content, NULL, Sort
-    if( i_dir_content == -1 )
-    {
@@ -378 +372 @@
-        }
-
-malloc( sizeof( char * ) * i_extensions 
+calloc (i_extensions, sizeof (char *)
-
-        for( a = 0; a < i_extensions; a++ )
@@ -394 +388 @@
-        }
-    }
+    if( psz_ignore ) free( psz_ignore );
-
-    /* While we still have entries in the directory */
-    for( i = 0; i < i_dir_content; i++ )
-    {
-struct dirent *p_dir_content
+const char *entry
-        int i_size_entry = strlen( psz_name ) +
-p_dir_content->d_name
-*psz_uri = (char *)malloc( sizeof(char) * i_size_entry )
-
-p_dir_content->d_name 
+entry
+psz_uri[i_size_entry]
+
+entry
-
-        /* if it starts with '.' then forget it */
-( p_dir_content->d_name[0] != '.' 
+ (entry[0] != '.'
-        {
-#if defined( S_ISDIR )
-            struct stat stat_data;
-
-( !stat( psz_uri, &stat_data 
+ (!utf8_stat (psz_uri, &stat_data
-             && S_ISDIR(stat_data.st_mode) && i_mode != MODE_COLLAPSE )
-#elif defined( DT_DIR )
-            if( ( p_dir_content->d_type & DT_DIR ) && i_mode != MODE_COLLAPSE )
-#else
-            if( 0 )
@@ -425 +418 @@
- * in a non-portable way.
- */
-( lstat( psz_uri, &stat_data 
+ (utf8_lstat (psz_uri, &stat_data
-                 || S_ISLNK(stat_data.st_mode) )
-                {
-                    msg_Dbg( p_playlist, "skipping directory symlink %s",
-                             psz_uri );
-                    free( psz_uri );
-                    continue;
-                }
@@ -437 +429 @@
-                {
-                    msg_Dbg( p_playlist, "skipping subdirectory %s", psz_uri );
-                    free( psz_uri );
-                    continue;
-                }
-                else if( i_mode == MODE_EXPAND )
-                {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-                    /* If we had the parent in category, the it is now node.
@@ -478 +452 @@
-            {
-                input_item_t *p_input;
-                char *psz_tmp1, *psz_tmp2, *psz_loc;
-
-                if( i_extensions > 0 )
-                {
-har *psz_dot = strrchr( p_dir_content->d_name
+onst char *psz_dot = strrchr (entry
-                    if( psz_dot++ && *psz_dot )
-                    {
@@ -494 +467 @@
-                        {
-                            msg_Dbg( p_playlist, "ignoring file %s", psz_uri );
-                            free( psz_uri );
-                            continue;
-                        }
@@ -500 +472 @@
-                }
-
-                psz_loc = FromLocale( psz_uri );
-                psz_tmp1 = vlc_fix_readdir_charset( VLC_OBJECT(p_playlist),
-                                                    psz_loc );
-                LocaleFree( psz_loc );
-
-                psz_loc = FromLocale( p_dir_content->d_name );
-                psz_tmp2 = vlc_fix_readdir_charset( VLC_OBJECT(p_playlist),
-                                                    psz_loc );
-                LocaleFree( psz_loc );
-
-                p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist),
-tmp1, psz_tmp2
+uri, entry
-                                                 -1, ITEM_TYPE_VFILE );
-
-playlist_AddWhereverNeeded( 
-
-
+
+    playlist_AddWhereverNeeded (
+    
+    
-            }
-        }
-        free( psz_uri );
-    }
-
@@ -526 +487 @@
-    if( ppsz_extensions ) free( ppsz_extensions );
-
-    if( psz_ignore ) free( psz_ignore );
-
-    for( i = 0; i < i_dir_content; i++ )
-        if( pp_dir_content[i] ) free( pp_dir_content[i] );