X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Faccess%2Ffile.c;h=01aa0e28a177ff2b2123070c07c1a0b3842d252b;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=29fa11cdefe550a33230ea6c5165add2a60f616d;hpb=2cb472dba008f7d877ffe6bae9c5575253365282;p=vlc diff --git a/modules/access/file.c b/modules/access/file.c index 29fa11cdef..01aa0e28a1 100644 --- a/modules/access/file.c +++ b/modules/access/file.c @@ -1,10 +1,12 @@ /***************************************************************************** * file.c: file input (file: access plug-in) ***************************************************************************** - * Copyright (C) 2001-2004 the VideoLAN team + * Copyright (C) 2001-2006 the VideoLAN team + * Copyright © 2006 Rémi Denis-Courmont * $Id$ * * Authors: Christophe Massiot + * Rémi Denis-Courmont * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,17 +27,14 @@ * Preamble *****************************************************************************/ #include -#include +#include +#include +#include -#include -#include #include #ifdef HAVE_SYS_TYPES_H # include #endif -#ifdef HAVE_SYS_TIME_H -# include -#endif #ifdef HAVE_SYS_STAT_H # include #endif @@ -43,16 +42,14 @@ # include #endif -#ifdef HAVE_UNISTD_H -# include -#elif defined( WIN32 ) && !defined( UNDER_CE ) +#if defined( WIN32 ) && !defined( UNDER_CE ) # include +#else +# include +# include #endif #if defined( WIN32 ) && !defined( UNDER_CE ) -/* stat() support for large files on win32 */ -# define stat _stati64 -# define fstat(a,b) _fstati64(a,b) # ifdef lseek # undef lseek # endif @@ -69,7 +66,7 @@ # define lseek fseek #endif -#include "charset.h" +#include /***************************************************************************** * Module descriptor @@ -79,20 +76,20 @@ static void Close( vlc_object_t * ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Allows you to modify the default caching value for file streams. This " \ - "value should be set in millisecond units." ) + "Caching value for files. This " \ + "value should be set in milliseconds." ) #define CAT_TEXT N_("Concatenate with additional files") #define CAT_LONGTEXT N_( \ - "Allows you to play split files as if they were part of a unique file. " \ - "Specify a comma-separated list of files." ) + "Play split files as if they were part of a unique file. " \ + "You need to specify a comma-separated list of files." ) vlc_module_begin(); - set_description( _("Standard filesystem file input") ); + set_description( _("File input") ); set_shortname( _("File") ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACCESS ); add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); - add_string( "file-cat", NULL, NULL, CAT_TEXT, CAT_LONGTEXT, VLC_TRUE ); + add_obsolete_string( "file-cat" ); set_capability( "access2", 50 ); add_shortcut( "file" ); add_shortcut( "stream" ); @@ -108,33 +105,14 @@ static int Seek( access_t *, int64_t ); static int Read( access_t *, uint8_t *, int ); static int Control( access_t *, int, va_list ); -static int _OpenFile( access_t *, const char * ); - -typedef struct -{ - char *psz_name; - int64_t i_size; - -} file_entry_t; +static int open_file( access_t *, const char * ); struct access_sys_t { unsigned int i_nb_reads; vlc_bool_t b_kfir; - /* Files list */ - int i_file; - file_entry_t **file; - - /* Current file */ - int i_index; -#ifndef UNDER_CE - int fd; - int fd_backup; -#else - FILE *fd; - FILE *fd_backup; -#endif + int fd; /* */ vlc_bool_t b_seekable; @@ -148,82 +126,23 @@ static int Open( vlc_object_t *p_this ) { access_t *p_access = (access_t*)p_this; access_sys_t *p_sys; - char *psz_name = strdup( p_access->psz_path ); - char *psz; - -#ifdef HAVE_SYS_STAT_H - struct stat stat_info; -#endif - vlc_bool_t b_stdin; - - file_entry_t * p_file; - b_stdin = psz_name[0] == '-' && psz_name[1] == '\0'; + vlc_bool_t b_stdin = !strcmp (p_access->psz_path, "-"); - if( !b_stdin ) - { - if( psz_name[0] == '~' && psz_name[1] == '/' ) - { - psz = malloc( strlen(p_access->p_vlc->psz_homedir) - + strlen(psz_name) ); - /* This is incomplete : we should also support the ~cmassiot/ - * syntax. */ - sprintf( psz, "%s/%s", p_access->p_vlc->psz_homedir, psz_name + 2 ); - free( psz_name ); - psz_name = psz; - } -#if defined(WIN32) - else if( !strcasecmp( p_access->psz_access, "file" ) - && ('/' == psz_name[0]) && psz_name[1] - && (':' == psz_name[2]) && ('/' == psz_name[3]) ) - { - /* - ** explorer can open path such as file:/C:/ or file:///C:/... - ** hence remove leading / if found - */ - ++psz_name; - } -#endif - -#ifdef HAVE_SYS_STAT_H - psz = ToLocale( psz_name ); - if( stat( psz, &stat_info ) ) - { - msg_Warn( p_access, "%s: %s", psz_name, strerror( errno ) ); - LocaleFree( psz ); - free( psz_name ); - return VLC_EGENERIC; - } - LocaleFree( psz ); -#endif - } + /* Update default_pts to a suitable value for file access */ + var_Create( p_access, "file-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - p_access->pf_read = Read; - p_access->pf_block = NULL; - p_access->pf_seek = Seek; - p_access->pf_control = Control; - p_access->info.i_update = 0; - p_access->info.i_size = 0; - p_access->info.i_pos = 0; - p_access->info.b_eof = VLC_FALSE; - p_access->info.i_title = 0; - p_access->info.i_seekpoint = 0; - p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) ); + STANDARD_READ_ACCESS_INIT; p_sys->i_nb_reads = 0; p_sys->b_kfir = VLC_FALSE; - p_sys->file = NULL; - p_sys->i_file = 0; - p_sys->i_index = 0; -#ifndef UNDER_CE - p_sys->fd = -1; -#endif + int fd = p_sys->fd = -1; - if( !strcasecmp( p_access->psz_access, "stream" ) ) + if (!strcasecmp (p_access->psz_access, "stream")) { p_sys->b_seekable = VLC_FALSE; p_sys->b_pace_control = VLC_FALSE; } - else if( !strcasecmp( p_access->psz_access, "kfir" ) ) + else if (!strcasecmp (p_access->psz_access, "kfir")) { p_sys->b_seekable = VLC_FALSE; p_sys->b_pace_control = VLC_FALSE; @@ -231,115 +150,61 @@ static int Open( vlc_object_t *p_this ) } else { - /* file:%s or %s */ + p_sys->b_seekable = VLC_TRUE; p_sys->b_pace_control = VLC_TRUE; - - if( b_stdin ) - { - p_sys->b_seekable = VLC_FALSE; - } -#ifdef UNDER_CE - else if( VLC_TRUE ) - { - /* We'll update i_size after it's been opened */ - p_sys->b_seekable = VLC_TRUE; - } -#elif defined( HAVE_SYS_STAT_H ) - else if( S_ISREG(stat_info.st_mode) || S_ISCHR(stat_info.st_mode) || - S_ISBLK(stat_info.st_mode) ) - { - p_sys->b_seekable = VLC_TRUE; - p_access->info.i_size = stat_info.st_size; - } - else if( S_ISFIFO(stat_info.st_mode) -# if !defined( SYS_BEOS ) && !defined( WIN32 ) - || S_ISSOCK(stat_info.st_mode) -# endif - ) - { - p_sys->b_seekable = VLC_FALSE; - } -#endif - else - { - msg_Err( p_access, "unknown file type for `%s'", psz_name ); - return VLC_EGENERIC; - } } - msg_Dbg( p_access, "opening file `%s'", psz_name ); + /* Open file */ + msg_Dbg (p_access, "opening file `%s'", p_access->psz_path); - if( b_stdin ) - { - p_sys->fd = 0; - } - else if( _OpenFile( p_access, psz_name ) ) + if (b_stdin) + fd = dup (0); + else + fd = open_file (p_access, p_access->psz_path); + +#ifdef HAVE_SYS_STAT_H + struct stat st; + + while (fd != -1) { - free( p_sys ); - free( psz_name ); - return VLC_EGENERIC; + if (fstat (fd, &st)) + msg_Err (p_access, "fstat(%d): %s", fd, strerror (errno)); + else + if (S_ISDIR (st.st_mode)) + /* The directory plugin takes care of that */ + msg_Dbg (p_access, "file is a directory, aborting"); + else + break; // success + + close (fd); + fd = -1; } +#endif - if( p_sys->b_seekable && !p_access->info.i_size ) + if (fd == -1) { - /* FIXME that's bad because all others access will be probed */ - msg_Err( p_access, "file %s is empty, aborting", psz_name ); - free( p_sys ); - free( psz_name ); + free (p_sys); return VLC_EGENERIC; } - - /* Update default_pts to a suitable value for file access */ - var_Create( p_access, "file-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - - /* - * Get the additional list of files - */ - p_file = malloc( sizeof(file_entry_t) ); - p_file->i_size = p_access->info.i_size; - p_file->psz_name = psz_name; - TAB_APPEND( p_sys->i_file, p_sys->file, p_file ); - - psz = var_CreateGetString( p_access, "file-cat" ); - if( *psz ) - { - char *psz_parser = psz_name = psz; - int64_t i_size; - - while( psz_name && *psz_name ) - { - psz_parser = strchr( psz_name, ',' ); - if( psz_parser ) *psz_parser = 0; - - psz_name = strdup( psz_name ); - if( psz_name ) - { - msg_Dbg( p_access, "adding file `%s'", psz_name ); - i_size = 0; + p_sys->fd = fd; #ifdef HAVE_SYS_STAT_H - if( !stat( psz_name, &stat_info ) ) - { - p_access->info.i_size += stat_info.st_size; - i_size = stat_info.st_size; - } - else - { - msg_Dbg( p_access, "cannot stat() file `%s'", psz_name ); - } + p_access->info.i_size = st.st_size; + if (!S_ISREG (st.st_mode) && !S_ISBLK (st.st_mode) + && (!S_ISCHR (st.st_mode) || (st.st_size == 0))) + p_sys->b_seekable = VLC_FALSE; +#else + p_sys->b_seekable = !b_stdin; +# warning File size not known! #endif - p_file = malloc( sizeof(file_entry_t) ); - p_file->i_size = i_size; - p_file->psz_name = psz_name; - TAB_APPEND( p_sys->i_file, p_sys->file, p_file ); - } - - psz_name = psz_parser; - if( psz_name ) psz_name++; - } + if (p_sys->b_seekable && (p_access->info.i_size == 0)) + { + /* FIXME that's bad because all others access will be probed */ + msg_Err (p_access, "file is empty, aborting"); + Close (p_this); + return VLC_EGENERIC; } - free( psz ); return VLC_SUCCESS; } @@ -347,22 +212,13 @@ static int Open( vlc_object_t *p_this ) /***************************************************************************** * Close: close the target *****************************************************************************/ -static void Close( vlc_object_t * p_this ) +static void Close (vlc_object_t * p_this) { access_t *p_access = (access_t*)p_this; access_sys_t *p_sys = p_access->p_sys; - int i; - - close( p_sys->fd ); - - for( i = 0; i < p_sys->i_file; i++ ) - { - free( p_sys->file[i]->psz_name ); - free( p_sys->file[i] ); - } - free( p_sys->file ); - free( p_sys ); + close (p_sys->fd); + free (p_sys); } /***************************************************************************** @@ -372,6 +228,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) { access_sys_t *p_sys = p_access->p_sys; int i_ret; + int fd = p_sys->fd; #if !defined(WIN32) && !defined(UNDER_CE) if( !p_sys->b_pace_control ) @@ -379,43 +236,28 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) if( !p_sys->b_kfir ) { /* Find if some data is available. This won't work under Windows. */ - struct timeval timeout; - fd_set fds; - - /* Initialize file descriptor set */ - FD_ZERO( &fds ); - FD_SET( p_sys->fd, &fds ); - - /* We'll wait 0.5 second if nothing happens */ - timeout.tv_sec = 0; - timeout.tv_usec = 500000; - - /* Find if some data is available */ - while( (i_ret = select( p_sys->fd + 1, &fds, NULL, NULL, &timeout )) == 0 - || (i_ret < 0 && errno == EINTR) ) + do { - FD_ZERO( &fds ); - FD_SET( p_sys->fd, &fds ); - timeout.tv_sec = 0; - timeout.tv_usec = 500000; + struct pollfd ufd; if( p_access->b_die ) return 0; - } - if( i_ret < 0 ) - { - msg_Err( p_access, "select error (%s)", strerror(errno) ); - return -1; + memset (&ufd, 0, sizeof (ufd)); + ufd.fd = fd; + ufd.events = POLLIN; + + i_ret = poll (&ufd, 1, 500); } + while (i_ret <= 0); - i_ret = read( p_sys->fd, p_buffer, i_len ); + i_ret = read (fd, p_buffer, i_len); } else { /* b_kfir ; work around a buggy poll() driver implementation */ - while ( (i_ret = read( p_sys->fd, p_buffer, i_len )) == 0 && - !p_access->b_die ) + while (((i_ret = read (fd, p_buffer, i_len)) == 0) + && !p_access->b_die) { msleep( INPUT_ERROR_SLEEP ); } @@ -423,15 +265,23 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) } else #endif /* WIN32 || UNDER_CE */ - { /* b_pace_control || WIN32 */ - i_ret = read( p_sys->fd, p_buffer, i_len ); - } + i_ret = read( fd, p_buffer, i_len ); if( i_ret < 0 ) { - if( errno != EINTR && errno != EAGAIN ) - msg_Err( p_access, "read failed (%s)", strerror(errno) ); + switch (errno) + { + case EINTR: + case EAGAIN: + break; + + default: + msg_Err (p_access, "read failed (%s)", strerror (errno)); + intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"), + _("VLC could not read file \"%s\"."), + strerror (errno)); + } /* Delay a bit to avoid consuming all the CPU. This is particularly * useful when reading from an unconnected FIFO. */ @@ -439,46 +289,22 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) } p_sys->i_nb_reads++; + #ifdef HAVE_SYS_STAT_H if( p_access->info.i_size != 0 && (p_sys->i_nb_reads % INPUT_FSTAT_NB_READS) == 0 ) { - struct stat stat_info; - int i_file = p_sys->i_index; + struct stat st; - if ( fstat( p_sys->fd, &stat_info ) == -1 ) + if ((fstat (fd, &st) == 0) + && (p_access->info.i_size != st.st_size)) { - msg_Warn( p_access, "couldn't stat again the file (%s)", strerror(errno) ); - } - else if ( p_sys->file[i_file]->i_size != stat_info.st_size ) - { - p_access->info.i_size += (stat_info.st_size - p_sys->file[i_file]->i_size ); - p_sys->file[i_file]->i_size = stat_info.st_size; + p_access->info.i_size = st.st_size; p_access->info.i_update |= INPUT_UPDATE_SIZE; } } #endif - /* If we reached an EOF then switch to the next file in the list */ - if ( i_ret == 0 && p_sys->i_index + 1 < p_sys->i_file ) - { - char *psz_name = p_sys->file[++p_sys->i_index]->psz_name; - p_sys->fd_backup = p_sys->fd; - - msg_Dbg( p_access, "opening file `%s'", psz_name ); - - if ( _OpenFile( p_access, psz_name ) ) - { - p_sys->fd = p_sys->fd_backup; - return 0; - } - - close( p_sys->fd_backup ); - - /* We have to read some data */ - return Read( p_access, p_buffer, i_len ); - } - if( i_ret > 0 ) p_access->info.i_pos += i_ret; else if( i_ret == 0 ) @@ -490,57 +316,24 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) /***************************************************************************** * Seek: seek to a specific location in a file *****************************************************************************/ -static int Seek( access_t *p_access, int64_t i_pos ) +static int Seek (access_t *p_access, int64_t i_pos) { - access_sys_t *p_sys = p_access->p_sys; - int64_t i_size = 0; - - /* Check which file we need to access */ - if( p_sys->i_file > 1 ) + if (i_pos > p_access->info.i_size) { - int i; - char *psz_name; - p_sys->fd_backup = p_sys->fd; - - for( i = 0; i < p_sys->i_file - 1; i++ ) - { - if( i_pos < p_sys->file[i]->i_size + i_size ) - break; - i_size += p_sys->file[i]->i_size; - } - psz_name = p_sys->file[i]->psz_name; - - msg_Dbg( p_access, "opening file `%s'", psz_name ); - - if ( i != p_sys->i_index && !_OpenFile( p_access, psz_name ) ) - { - /* Close old file */ - close( p_sys->fd_backup ); - p_sys->i_index = i; - } - else - { - p_sys->fd = p_sys->fd_backup; - } + msg_Err (p_access, "seeking too far"); + i_pos = p_access->info.i_size; } - - lseek( p_sys->fd, i_pos - i_size, SEEK_SET ); - - p_access->info.i_pos = i_pos; - if( p_access->info.i_size < p_access->info.i_pos ) + else if (i_pos < 0) { - msg_Err( p_access, "seeking too far" ); - p_access->info.i_pos = p_access->info.i_size; + msg_Err (p_access, "seeking too early"); + i_pos = 0; } - else if( p_access->info.i_pos < 0 ) - { - msg_Err( p_access, "seeking too early" ); - p_access->info.i_pos = 0; - } - /* Reset eof */ + + p_access->info.i_pos = i_pos; p_access->info.b_eof = VLC_FALSE; - /* FIXME */ + /* Determine which file we need to access */ + lseek (p_access->p_sys->fd, i_pos, SEEK_SET); return VLC_SUCCESS; } @@ -601,22 +394,45 @@ static int Control( access_t *p_access, int i_query, va_list args ) } +static char *expand_path (const access_t *p_access, const char *path) +{ + if (strncmp (path, "~/", 2) == 0) + { + char *res; + + // TODO: we should also support the ~cmassiot/ syntax + if (asprintf (&res, "%s/%s", p_access->p_libvlc->psz_homedir, path + 2) == -1) + return NULL; + return res; + } + +#if defined(WIN32) + if (!strcasecmp (p_access->psz_access, "file") + && ('/' == path[0]) && path[1] && (':' == path[2]) && ('/' == path[3])) + // Explorer can open path such as file:/C:/ or file:///C:/ + // hence remove leading / if found + return strdup (path + 1); +#endif + + return strdup (path); +} + + /***************************************************************************** - * OpenFile: Opens a specific file + * open_file: Opens a specific file *****************************************************************************/ -static int _OpenFile( access_t * p_access, const char * psz_name ) +static int open_file (access_t *p_access, const char *psz_name) { - access_sys_t *p_sys = p_access->p_sys; - const char *psz_localname; - - psz_localname = ToLocale( psz_name ); + char *path = expand_path (p_access, psz_name); #ifdef UNDER_CE - p_sys->fd = fopen( psz_localname, "rb" ); - LocaleFree( psz_localname ); + p_sys->fd = utf8_fopen( path, "rb" ); if ( !p_sys->fd ) { msg_Err( p_access, "cannot open file %s", psz_name ); + intf_UserFatal( p_access, VLC_FALSE, _("File reading failed"), + _("VLC could not open file \"%s\"."), psz_name ); + free (path); return VLC_EGENERIC; } @@ -625,24 +441,25 @@ static int _OpenFile( access_t * p_access, const char * psz_name ) p_access->info.i_update |= INPUT_UPDATE_SIZE; fseek( p_sys->fd, 0, SEEK_SET ); #else - - p_sys->fd = open( psz_localname, O_NONBLOCK /*| O_LARGEFILE*/ ); - LocaleFree( psz_localname ); - if ( p_sys->fd == -1 ) + int fd = utf8_open (path, O_RDONLY | O_NONBLOCK /* O_LARGEFILE*/, 0666); + free (path); + if (fd == -1) { - msg_Err( p_access, "cannot open file %s (%s)", psz_name, - strerror(errno) ); - return VLC_EGENERIC; + msg_Err (p_access, "cannot open file %s (%s)", psz_name, + strerror (errno)); + intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"), + _("VLC could not open file \"%s\" (%s)."), + psz_name, strerror (errno)); + return -1; } -#if defined(HAVE_FCNTL_H) && defined(F_FDAHEAD) && defined(F_NOCACHE) +# if defined(HAVE_FCNTL_H) && defined(F_FDAHEAD) && defined(F_NOCACHE) /* We'd rather use any available memory for reading ahead * than for caching what we've already seen/heard */ - fcntl(p_sys->fd, F_RDAHEAD, 1); - fcntl(p_sys->fd, F_NOCACHE, 1); -#endif - + fcntl (fd, F_RDAHEAD, 1); + fcntl (fd, F_NOCACHE, 1); +# endif #endif - return VLC_SUCCESS; + return fd; }