Changeset a9ac3e9e17a136f4114f27f99dae976a81bac7e2

Show
Ignore:
Timestamp:
28/11/06 18:05:31 (2 years ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1164733531 +0000
git-parent:

[8d433f3dfe45d73ff5344173563d596ec8b54758]

git-author:
Rafaël Carré <funman@videolan.org> 1164733531 +0000
Message:

Uses file:// MRL only files, don't bug when recursively adding directories

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/access/directory.c

    rc554336 ra9ac3e9  
    394394        const char *entry = pp_dir_content[i]; 
    395395        int i_size_entry = strlen( psz_name ) + 
    396                            strlen( entry ) + 9; /* "file://" + "/" + '\0' */ 
     396                           strlen( entry ) + 2; 
    397397        char psz_uri[i_size_entry]; 
    398  
    399         sprintf( psz_uri, "file://%s/%s", psz_name, entry); 
     398        char psz_mrl[i_size_entry + 7]; /* "file://psz_uri" */ 
     399 
     400        sprintf( psz_uri, "%s/%s", psz_name, entry); 
    400401 
    401402        /* if it starts with '.' then forget it */ 
    …… 
    472473                } 
    473474 
     475                sprintf( &psz_mrl, "file://%s", psz_uri ); 
    474476                p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist), 
    475                                                  psz_uri, entry, 0, NULL, 
     477                                                 psz_mrl, entry, 0, NULL, 
    476478                                                 -1, ITEM_TYPE_VFILE ); 
    477479                if (p_input != NULL)