Changeset 1c3528868c36e57e12cc0d99722255b261f50c41

Timestamp:

02/13/06 09:30:55 (3 years ago)

Author:

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

git-committer:

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

git-parent:

[8a1c45dff8c198bf15626a10093ce45a7a114c20]

git-author:

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

Message:

All Unicode fixes for fopen() (refs #528)

Files:

• src/input/subtitles.c (modified) (1 diff)
• src/misc/image.c (modified) (3 diffs)
• src/misc/modules.c (modified) (3 diffs)
• src/misc/update.c (modified) (2 diffs)
• src/misc/vlm.c (modified) (3 diffs)
• src/network/acl.c (modified) (2 diffs)
• src/osd/osd_parser.c (modified) (26 diffs)
• src/playlist/loadsave.c (modified) (2 diffs)

src/input/subtitles.c

@@ -421 +421 @@
-                    asprintf( &psz_path, "%s%s", j < 0 ? f_dir : *subdirs, p_fixed_name );
-                    msg_Dbg( p_this, "autodetected subtitle: %s with priority %d", p_fixed_name, i_prio );
-       
+                
-                    if( ( f = utf8_fopen( psz_path, "rt" ) ) )
-                    {
-                        fclose( f );
-
+    
-                        result[i_sub_count].priority = i_prio;
-                        result[i_sub_count].psz_fname = psz_path;

src/misc/image.c

@@ -35 +35 @@
-#include <vlc_filter.h>
-#include <vlc_image.h>
+#include <charset.h>
-
-static picture_t *ImageRead( image_handler_t *, block_t *,
@@ -207 +208 @@
-    int i_size;
-
-
+utf8_
-    if( !file )
-    {
@@ -345 +346 @@
-    }
-
-
+utf8_
-    if( !file )
-    {

src/misc/modules.c

@@ -1626 +1626 @@
-    msg_Dbg( p_this, "loading plugins cache file %s", psz_filename );
-
-
+utf8_
-    if( !file )
-    {
@@ -1948 +1948 @@
-    strcat( psz_filename, "/CACHEDIR.TAG" );
-
-
+utf8_
-    if( file )
-    {
@@ -1960 +1960 @@
-    msg_Dbg( p_this, "saving plugins cache file %s", psz_filename );
-
-
+utf8_
-    if( !file )
-    {

src/misc/update.c

@@ -46 +46 @@
-#include "vlc_xml.h"
-#include "vlc_interaction.h"
+#include "charset.h"
-
-/*****************************************************************************
@@ -1277 +1278 @@
-    {
-
-
+utf8_
-        if( !p_file )
-        {

src/misc/vlm.c

@@ -44 +44 @@
-#include "vlc_vlm.h"
-#include "vlc_vod.h"
+#include "charset.h"
-
-#define FREE( p ) \
@@ -195 +196 @@
-    if( !p_vlm || !psz_file ) return 1;
-
-
+utf8_
-    if( file == NULL ) return 1;
-
@@ -222 +223 @@
-    if( !p_vlm || !psz_file ) return 1;
-
-
+utf8_
-    if( file == NULL ) return 1;
-

src/network/acl.c

@@ -35 +35 @@
-
-#include "network.h"
+#include "charset.h"
-
-/* FIXME: rwlock on acl, but libvlc doesn't implement rwlock */
@@ -269 +270 @@
-        return -1;
-
-
+utf8_
-    if( file == NULL )
-        return -1;

src/osd/osd_parser.c

@@ -35 +35 @@
-#include <vlc_image.h>
-#include <vlc_osd.h>
+#include <charset.h>
-
-
@@ -70 +71 @@
-        p_pic = image_ReadUrl( p_image, psz_filename, &fmt_in, &fmt_out );
-        image_HandlerDelete( p_image );
-        
+
-        p_pic = osd_YuvaYuvp( p_this, p_pic );
-#endif
@@ -85 +86 @@
-{
-    if( !p_menu ) return NULL;
-
+
-    p_menu->p_state = (osd_menu_state_t *) malloc( sizeof( osd_menu_state_t ) );
-    if( !p_menu->p_state )
@@ -96 +97 @@
-    p_menu->i_x = i_x;
-    p_menu->i_y = i_y;
-
- 
+
+
-}
-
@@ -124 +125 @@
-    if( !p_button )
-        return NULL;
-
+
-    memset( p_button, 0, sizeof(osd_button_t) );
-    p_button->psz_action = strdup(psz_action);
@@ -131 +132 @@
-    p_button->i_x = i_x;
-    p_button->i_y = i_y;
-
+
-    return p_button;
-}
@@ -137 +138 @@
-/*****************************************************************************
- * Free a button
- 
+
-static void osd_ButtonFree( vlc_object_t *p_this, osd_button_t *p_button )
-{
@@ -143 +144 @@
-    osd_button_t *p_next = NULL;
-    osd_button_t *p_prev = NULL;
-
+
-    /* First walk to the end. */
-    while( p_current->p_next )
-    {
-        p_next = p_current->p_next;
-        
+
-    }
-    /* Then free end first and walk to the start. */
@@ -158 +159 @@
-        if( p_current->p_next )
-        {
- 
+
-                free( p_current->p_next->psz_name );
-            if( p_current->p_next->psz_action )
@@ -168 +169 @@
-            if( p_current->p_feedback )
-                free( p_current->p_feedback );
-
+
-            p_current->p_next->psz_action_down = NULL;
-            p_current->p_next->psz_action = NULL;
-            p_current->p_next->psz_name = NULL;
-            p_current->p_feedback = NULL;
-
-            
-   
+
+
+
-                osd_StatesFree( p_this, p_current->p_next->p_states );
-          
+
-            if( p_current->p_next) free( p_current->p_next );
-  
-            
-
+
+
+
-        if( p_current->p_up )
-        {
- 
+
-                free( p_current->p_up->psz_name );
-            if( p_current->p_up->psz_action )
@@ -194 +195 @@
-            if( p_current->p_feedback )
-                free( p_current->p_feedback );
-
+
-            p_current->p_up->psz_action_down = NULL;
-            p_current->p_up->psz_action = NULL;
-            p_current->p_up->psz_name = NULL;
-            p_current->p_feedback = NULL;
-
-            
-   
+
+
+
-                osd_StatesFree( p_this, p_current->p_up->p_states );
-          
+
-            if( p_current->p_up ) free( p_current->p_up );
-          
+
-        }
-    
+
-    /* Free the last one. */
- 
-
-    
+
+
+
-        if( p_button->psz_name ) free( p_button->psz_name );
-        if( p_button->psz_action ) free( p_button->psz_action );
-   
+
-        if( p_current->p_feedback && p_current->p_feedback->p_data_orig )
-            free( p_current->p_feedback->p_data_orig );
-        if( p_current->p_feedback )
-            free( p_current->p_feedback );
-
+
-        p_button->psz_name = NULL;
-        p_button->psz_action = NULL;
-        p_button->psz_action_down = NULL;
-        p_current->p_feedback = NULL;
-
+
-        if( p_button->p_states )
-            osd_StatesFree( p_this, p_button->p_states );
-          
+
-        free( p_button );
-        p_button = NULL;
@@ -242 +243 @@
-    if( !p_state )
-        return NULL;
-
-    
+
+
-    p_state->p_pic = osd_LoadImage( p_this, psz_file );
-
@@ -267 +268 @@
-    osd_state_t *p_next = NULL;
-    osd_state_t *p_prev = NULL;
-
+
-    while( p_state->p_next )
-    {
@@ -284 +285 @@
-                free( p_state->p_next->p_pic->p_data_orig );
-            if( p_state->p_next->p_pic ) free( p_state->p_next->p_pic );
-      
+
-            if( p_state->p_next->psz_state ) free( p_state->p_next->psz_state );
-            p_state->p_next->psz_state = NULL;
-            free( p_state->p_next );
-        
+
-        }
-    }
@@ -313 +314 @@
-{
-    osd_button_t   *p_current = NULL; /* button currently processed */
- 
-
-    
+
+
+
-    FILE       *fd = NULL;
-    int        result = 0;
-
+
-    msg_Dbg( p_this, "opening osd definition file %s", psz_file );
-
-  
+utf8_
+
-    {
-        msg_Err( p_this, "failed opening osd definition file %s", psz_file );
-        return VLC_EGENERIC;
-    }
-
-    
+
+
-    if( !feof( fd ) )
-    {
@@ -338 +339 @@
-        psz_path = config_GetPsz( p_this, "osdmenu-file-path" );
-        if( psz_path == NULL )
-                                    
+
-            result = fscanf(fd, "%24s %255s", &action[0], &path[0] );
-        }
-        else
-        {
- 
+
-             * it might be null terminated.
-             */
@@ -358 +359 @@
-        if( (i_len > 0) && path[i_len] != '\\' )
-            path[i_len] = '\\';
-        
+
-        if( (i_len > 0) && path[i_len] != '/' )
-            path[i_len] = '/';
@@ -364 +365 @@
-        path[i_len+1] = '\0';
-        if( result == 0 || result == EOF )
-                        
+
-        msg_Dbg( p_this, "%s=%s", &action[0], &path[0] );
-
+
-        if( i_len == 0 )
-            *p_menu = osd_MenuNew( *p_menu, NULL, 0, 0 );
@@ -372 +373 @@
-            *p_menu = osd_MenuNew( *p_menu, &path[0], 0, 0 );
-    }
-
+
-    if( !*p_menu )
-        goto error;
-
+
-    /* read successive lines */
-    while( !feof( fd ) )
-   
+
-        osd_state_t   *p_state_current = NULL; /* button state currently processed */
- 
-
-      
+
+
+
-        char action[25] = "";
-        char state[25]  = "";
-        char file[256]  = "";
-        
+
-        int  i_x = 0;
-        int  i_y = 0;
@@ -392 +393 @@
-        result = fscanf( fd, "%24s %24s (%d,%d)", &cmd[0], &action[0], &i_x, &i_y );
-        if( result == 0 )
-              
+
-        if( strncmp( &cmd[0], "action", 6 ) != 0 )
-            break;
-                    
-
+
+
-        p_prev = p_current;
-   
+
-        if( !p_current )
-            goto error;
-
+
-        if( p_prev )
-            
+
-        else
-            
+
-        p_current->p_prev = p_prev;
-
+
-        /* parse all states */
-        while( !feof( fd ) )
-        {
-            char type[25] = "";
-
-   
+
+
-            if( result == 0 )
-                goto error;
-
-    
+
+
-            if( strncmp( &state[0], "action", 6 ) == 0 )
-            {
-                osd_button_t   *p_up = NULL;
-
+
-                result = fscanf( fd, "%24s (%d,%d)", &action[0], &i_x, &i_y );
-                if( result == 0 )
-                    goto error;
-                
-                 
- 
+
+
+
-                    goto error;
-                    
+
-                p_up->p_down = p_current;
-                 
+
-                msg_Dbg( p_this, " + (menu up) hotkey=%s (%d,%d)", &action[0], i_x, i_y );
-                /* Parse type state */
-   
+
-                if( result == 0 )
-                    goto error;
-                if( strncmp( &cmd[0], "type", 4 ) == 0 )
-  
+
-                    if( strncmp( &type[0], "volume", 6 ) == 0 )
-                    {
@@ -446 +447 @@
-                }
-                /* Parse range state */
-   
+
-                if( result == 0 )
-                    goto error;
-        
+
-                if( strncmp( &state[0], "range", 5 ) == 0 )
-                {
-                    osd_state_t   *p_range_current = NULL; /* range state currently processed */
- 
+
-                    int i_index = 0;
-
+
-                    p_up->b_range = VLC_TRUE;
-
-   
+
+
-                    if( result == 0 )
-                        goto error;
-
-   
+
+
-                    if( result == 0 )
-                        goto error;
-
+
-                    msg_Dbg( p_this, " + (menu up) hotkey down %s, file=%s%s", &action[0], (*p_menu)->psz_path, &file[0] );
-
+
-                    if( p_up->psz_action_down ) free( p_up->psz_action_down );
-                     
-
+
+
-                    /* Parse range contstruction :
- 
+
-                     *      <state1> <file1>
-                     *
-                     *      <stateN> <fileN>
- 
-                
+
+
-                    while( !feof( fd ) )
-                    {
-   
+
-                        if( result == 0 )
-                            goto error;
-                        if( strncmp( &file[0], "end", 3 ) == 0 )
-                            break;
-
+
-                        p_range_prev = p_range_current;
-
+
-                        if( (*p_menu)->psz_path )
-                        {
-                            size_t i_path_size = strlen( (*p_menu)->psz_path );
-                            size_t i_file_size = strlen( &file[0] );
-
+
-                            strncpy( &path[0], (*p_menu)->psz_path, i_path_size );
-                            strncpy( &path[i_path_size], &file[0], 512 - (i_path_size + i_file_size) );
-                            path[ i_path_size + i_file_size ] = '\0';
-
+
-                            p_range_current = osd_StateNew( p_this, &path[0], "pressed" );
-                        }
-                        else /* absolute paths are used. */
-                            p_range_current = osd_StateNew( p_this, &file[0], "pressed" );
-
+
-                        if( !p_range_current || !p_range_current->p_pic )
-                            goto error;
-
-                
+
+
-                        p_up->i_ranges++;
-
+
-                        if( p_range_prev )
-                            p_range_prev->p_next = p_range_current;
-                        else
-                                
+
-                        p_range_current->p_prev = p_range_prev;
-
- 
- 
-                        
+
+
+
+
-                    }
-                    if( i_index > 0 )
- 
+
-                        osd_state_t *p_range = NULL;
-
-                        
+
+
-                        p_range = p_up->p_states;
-                        while( (--i_index > 0) && p_range->p_next )
@@ -531 +532 @@
-                        }
-                        p_up->p_current_state = p_range;
-                    
+
-                    else p_up->p_current_state = p_up->p_states;
-
-   
-   
+
+
+
-                if( result == 0 )
-                    
+
-                if( strncmp( &state[0], "end", 3 ) != 0 )
-                    goto error;
-
+
-                /* Continue at the beginning of the while() */
-                continue;
-            }
-
-        
+
+
-            if( strncmp( &state[0], "range", 5 ) == 0 )
-            {
-                osd_state_t   *p_range_current = NULL; /* range state currently processed */
- 
+
-                int i_index = 0;
-
+
-                p_current->b_range = VLC_TRUE;
-
-   
+
-                if( result == 0 )
-                    goto error;
-
-   
+
+
-                if( result == 0 )
-                    goto error;
-
-                        
+
+
-                if( p_current->psz_action_down ) free( p_current->psz_action_down );
-                     
-
+
+
-                /* Parse range contstruction :
- 
+
-                 *      <state1> <file1>
-                 *
-                 *      <stateN> <fileN>
- 
-                
+
+
-                while( !feof( fd ) )
-                {
-   
+
-                    if( result == 0 )
-                        goto error;
-                    if( strncmp( &file[0], "end", 3 ) == 0 )
-                        break;
-
+
-                    p_range_prev = p_range_current;
-
+
-                    if( (*p_menu)->psz_path )
-                    {
-                        size_t i_path_size = strlen( (*p_menu)->psz_path );
-                        size_t i_file_size = strlen( &file[0] );
-
+
-                        strncpy( &path[0], (*p_menu)->psz_path, i_path_size );
-                        strncpy( &path[i_path_size], &file[0], 512 - (i_path_size + i_file_size) );
-                        path[ i_path_size + i_file_size ] = '\0';
-
+
-                        p_range_current = osd_StateNew( p_this, &path[0], "pressed" );
-                    }
-                    else /* absolute paths are used. */
-                        p_range_current = osd_StateNew( p_this, &file[0], "pressed" );
-
+
-                    if( !p_range_current || !p_range_current->p_pic )
-                        goto error;
-
-                
+
+
-                    p_current->i_ranges++;
-
+
-                    if( p_range_prev )
-                        p_range_prev->p_next = p_range_current;
-                    else
-                                
+
-                    p_range_current->p_prev = p_range_prev;
-
- 
- 
-                        
+
+
+
+
-                }
-                if( i_index > 0 )
-             
+
-                    osd_state_t *p_range = NULL;
-
-                        
+
+
-                    p_range = p_current->p_states;
-                    while( (--i_index > 0) && p_range->p_next )
@@ -626 +627 @@
-                    }
-                    p_current->p_current_state = p_range;
-                    
+
-                else p_current->p_current_state = p_current->p_states;
-                /* Continue at the beginning of the while() */
-                continue;
-   
+
-            if( strncmp( &state[0], "end", 3 ) == 0 )
-                break;
-
-   
+
+
-            if( result == 0 )
-                                
-
+
+
-            p_state_prev = p_state_current;
-
@@ -648 +649 @@
-                goto error;
-            }
-
+
-            if( (*p_menu)->psz_path )
-            {
-                size_t i_path_size = strlen( (*p_menu)->psz_path );
-                size_t i_file_size = strlen( &file[0] );
-
+
-                strncpy( &path[0], (*p_menu)->psz_path, i_path_size );
-                strncpy( &path[i_path_size], &file[0], 512 - (i_path_size + i_file_size) );
-                path[ i_path_size + i_file_size ] = '\0';
-
+
-                p_state_current = osd_StateNew( p_this, &path[0], &state[0] );
-            }
-            else /* absolute paths are used. */
-                p_state_current = osd_StateNew( p_this, &file[0], &state[0] );
-
+
-            if( !p_state_current || !p_state_current->p_pic )
-                goto error;
-
+
-            if( p_state_prev )
-                p_state_prev->p_next = p_state_current;
-            else
-                                
+
-            p_state_current->p_prev = p_state_prev;
-
+
-            msg_Dbg( p_this, " |- state=%s, file=%s%s", &state[0], (*p_menu)->psz_path, &file[0] );
-        }
@@ -677 +678 @@
-    }
-
- 
+
-     * The OSD menu behaves like a roundrobin list.
-        
+
-    p_current = (*p_menu)->p_button;
-    while( p_current && p_current->p_next )
@@ -690 +691 @@
-    fclose( fd );
-    return 0;
-
- 
+
+
-error:
-    msg_Err( p_this, "parsing file failed (returned %d)", result );
-    fclose( fd );
-        
+
-}
-