Changeset 38386dfd2b5352d7df1f4c873cf214e4790642b5

Show
Ignore:
Timestamp:
28/03/08 16:52:53 (6 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1206719573 +0100
git-parent:

[6962020b256671f0d54793afbbd2e63d7a0e5d0b]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1206719573 +0100
Message:

module: Fix ':' usage and more largely previous commit.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/modules/modules.c

    r6962020 r38386df  
    937937            path[i] = paths[i]; 
    938938    } 
     939    path[i] = 0; 
    939940 
    940941    /* Return the remaining paths */ 
    …… 
    955956 
    956957#if defined( WIN32 ) || defined( UNDER_CE ) 
    957     const char * extra_path = ""; 
     958    const char * extra_path = NULL; 
    958959#else 
    959     const char * extra_path = ":" PLUGIN_PATH; 
     960    const char * extra_path = PLUGIN_PATH; 
    960961#endif 
    961962 
    …… 
    963964    char * userpaths = config_GetPsz( p_this, "plugin-path" ); 
    964965 
    965     if( asprintf( &paths, "modules%s:plugins:%s", extra_path, userpaths ) < 0 ) 
     966    if( asprintf( &paths, "modules%s%s"PATH_SEP"plugins%s%s", 
     967                    extra_path ? PATH_SEP : "", 
     968                    extra_path ? extra_path : "", 
     969                    userpaths ? PATH_SEP : "", 
     970                    userpaths ? userpaths : "" ) < 0 ) 
    966971    { 
    967972        msg_Err( p_this, "Not enough memory" ); 
    …… 
    976981    { 
    977982        char *psz_fullpath; 
    978   
     983 
    979984        path = copy_next_paths_token( paths_iter, &paths_iter ); 
    980985        if( !path )