X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Faccess%2Ffile.c;h=70929c799227d7594c1d8d7e18df8b0dfa373798;hb=ad9b410d67c47b4a52bd393e67925b6b14d3f7c2;hp=58aecfb8e91f46690c18b6f51d7691771bc91c69;hpb=378c8bedf2595b2fdc7f42f0550c7016099ea139;p=vlc diff --git a/modules/access/file.c b/modules/access/file.c index 58aecfb8e9..70929c7992 100644 --- a/modules/access/file.c +++ b/modules/access/file.c @@ -2,7 +2,7 @@ * file.c: file input (file: access plug-in) ***************************************************************************** * Copyright (C) 2001-2006 the VideoLAN team - * Copyright © 2006 Rémi Denis-Courmont + * Copyright © 2006-2007 Rémi Denis-Courmont * $Id$ * * Authors: Christophe Massiot @@ -26,12 +26,17 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include -#include -#include +#include #include #ifdef HAVE_SYS_TYPES_H # include @@ -42,34 +47,34 @@ #ifdef HAVE_FCNTL_H # include #endif +#if defined (__linux__) +# include +# include +# define HAVE_FSTATFS 1 +#elif defined (HAVE_SYS_MOUNT_H) +# include +# define HAVE_FSTATFS 1 +#endif -#if defined( WIN32 ) && !defined( UNDER_CE ) +#if defined( WIN32 ) # include +# include #else # include # include #endif #if defined( WIN32 ) && !defined( UNDER_CE ) -/* fstat() support for large files on win32 */ -# define fstat(a,b) _fstati64(a,b) # ifdef lseek # undef lseek # endif # define lseek _lseeki64 #elif defined( UNDER_CE ) -# ifdef read -# undef read -# endif -# define read(a,b,c) fread(b,1,c,a) -# define close(a) fclose(a) -# ifdef lseek -# undef lseek -# endif -# define lseek fseek +/* FIXME the commandline on wince is a mess */ +# define dup(a) -1 #endif -#include "charset.h" +#include /***************************************************************************** * Module descriptor @@ -81,31 +86,29 @@ static void Close( vlc_object_t * ); #define CACHING_LONGTEXT N_( \ "Caching value for files. This " \ "value should be set in milliseconds." ) -#define CAT_TEXT N_("Concatenate with additional files") -#define CAT_LONGTEXT N_( \ - "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( _("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_deprecated( "file-cat", VLC_TRUE ); - set_capability( "access2", 50 ); - add_shortcut( "file" ); - add_shortcut( "stream" ); - add_shortcut( "kfir" ); - set_callbacks( Open, Close ); -vlc_module_end(); + +vlc_module_begin () + set_description( N_("File input") ) + set_shortname( N_("File") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) + add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ) + change_safe() + add_obsolete_string( "file-cat" ) + set_capability( "access", 50 ) + add_shortcut( "file" ) + add_shortcut( "fd" ) + add_shortcut( "stream" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Exported prototypes *****************************************************************************/ static int Seek( access_t *, int64_t ); -static int Read( access_t *, uint8_t *, int ); +static int NoSeek( access_t *, int64_t ); +static ssize_t Read( access_t *, uint8_t *, size_t ); static int Control( access_t *, int, va_list ); static int open_file( access_t *, const char * ); @@ -113,15 +116,45 @@ static int open_file( access_t *, const char * ); struct access_sys_t { unsigned int i_nb_reads; - vlc_bool_t b_kfir; int fd; /* */ - vlc_bool_t b_seekable; - vlc_bool_t b_pace_control; + bool b_pace_control; }; +static bool IsRemote (int fd) +{ +#ifdef HAVE_FSTATFS + struct statfs stf; + + if (fstatfs (fd, &stf)) + return false; + +#if defined(MNT_LOCAL) + return !(stf.f_flags & MNT_LOCAL); + +#elif defined (__linux__) + switch (stf.f_type) + { + case AFS_SUPER_MAGIC: + case CODA_SUPER_MAGIC: + case NCP_SUPER_MAGIC: + case NFS_SUPER_MAGIC: + case SMB_SUPER_MAGIC: + case 0xFF534D42 /*CIFS_MAGIC_NUMBER*/: + return true; + } + return false; + +#endif +#else /* !HAVE_FSTATFS */ + return false; + +#endif +} + + /***************************************************************************** * Open: open the file *****************************************************************************/ @@ -130,88 +163,70 @@ static int Open( vlc_object_t *p_this ) access_t *p_access = (access_t*)p_this; access_sys_t *p_sys; - vlc_bool_t b_stdin = !strcmp (p_access->psz_path, "-"); - /* Update default_pts to a suitable value for file access */ var_Create( p_access, "file-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); STANDARD_READ_ACCESS_INIT; p_sys->i_nb_reads = 0; - p_sys->b_kfir = VLC_FALSE; - int fd = p_sys->fd = -1; - - 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")) - { - p_sys->b_seekable = VLC_FALSE; - p_sys->b_pace_control = VLC_FALSE; - p_sys->b_kfir = VLC_TRUE; - } - else - { - p_sys->b_seekable = VLC_TRUE; - p_sys->b_pace_control = VLC_TRUE; - } + p_sys->b_pace_control = true; /* Open file */ - msg_Dbg (p_access, "opening file `%s'", p_access->psz_path); + int fd = -1; - if (b_stdin) + if (!strcasecmp (p_access->psz_access, "fd")) + fd = dup (atoi (p_access->psz_path)); + else if (!strcmp (p_access->psz_path, "-")) fd = dup (0); else + { + msg_Dbg (p_access, "opening file `%s'", p_access->psz_path); fd = open_file (p_access, p_access->psz_path); + } + if (fd == -1) + goto error; #ifdef HAVE_SYS_STAT_H struct stat st; - while (fd != -1) + if (fstat (fd, &st)) { - 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; + msg_Err (p_access, "failed to read (%m)"); + goto error; } -#endif - - if (fd == -1) + /* Directories can be opened and read from, but only readdir() knows + * how to parse the data. The directory plugin will do it. */ + if (S_ISDIR (st.st_mode)) { - free (p_sys); - return VLC_EGENERIC; + msg_Dbg (p_access, "ignoring directory"); + goto error; + } + if (S_ISREG (st.st_mode)) + p_access->info.i_size = st.st_size; + else if (!S_ISBLK (st.st_mode)) + { + p_access->pf_seek = NoSeek; + p_sys->b_pace_control = strcasecmp (p_access->psz_access, "stream"); } - p_sys->fd = fd; - -#ifdef HAVE_SYS_STAT_H - 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 - if (p_sys->b_seekable && (p_access->info.i_size == 0)) + if (IsRemote(fd)) { - /* 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; + int i_cache = var_GetInteger (p_access, "file-caching") + 700; + var_SetInteger (p_access, "file-caching", i_cache); + msg_Warn (p_access, "Opening remote file, increasing cache: %d", + i_cache); } - msg_Dbg (p_access, "opened file of size "I64Fd" (FIXME: remove this)", - p_access->info.i_size); + p_sys->fd = fd; return VLC_SUCCESS; + +error: + if (fd != -1) + close (fd); + free (p_sys); + return VLC_EGENERIC; } /***************************************************************************** @@ -226,52 +241,24 @@ static void Close (vlc_object_t * p_this) free (p_sys); } + +#include + /***************************************************************************** * Read: standard read on a file descriptor. *****************************************************************************/ -static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) +static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) { access_sys_t *p_sys = p_access->p_sys; - int i_ret; int fd = p_sys->fd; + ssize_t i_ret; -#if !defined(WIN32) && !defined(UNDER_CE) - if( !p_sys->b_pace_control ) - { - if( !p_sys->b_kfir ) - { - /* Find if some data is available. This won't work under Windows. */ - do - { - struct pollfd ufd; - - if( p_access->b_die ) - return 0; - - memset (&ufd, 0, sizeof (ufd)); - ufd.fd = fd; - ufd.events = POLLIN; - - i_ret = poll (&ufd, 1, 500); - } - while (i_ret <= 0); - - i_ret = read (fd, p_buffer, i_len); - } - else - { - /* b_kfir ; work around a buggy poll() driver implementation */ - while (((i_ret = read (fd, p_buffer, i_len)) == 0) - && !p_access->b_die) - { - msleep( INPUT_ERROR_SLEEP ); - } - } - } +#ifndef WIN32 + if (p_access->pf_seek == NoSeek) + i_ret = net_Read (p_access, fd, NULL, p_buffer, i_len, false); else -#endif /* WIN32 || UNDER_CE */ - /* b_pace_control || WIN32 */ - i_ret = read( fd, p_buffer, i_len ); +#endif + i_ret = read (fd, p_buffer, i_len); if( i_ret < 0 ) { @@ -282,22 +269,23 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) 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)); + msg_Err (p_access, "failed to read (%m)"); + dialog_Fatal (p_access, _("File reading failed"), "%s", + _("VLC could not read the file.")); + p_access->info.b_eof = true; + return 0; } - - /* Delay a bit to avoid consuming all the CPU. This is particularly - * useful when reading from an unconnected FIFO. */ - msleep( INPUT_ERROR_SLEEP ); } + else if( i_ret > 0 ) + p_access->info.i_pos += i_ret; + else + p_access->info.b_eof = true; 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 ) + if ((p_access->info.i_size && !(p_sys->i_nb_reads % INPUT_FSTAT_NB_READS)) + || (p_access->info.i_pos > p_access->info.i_size)) { struct stat st; @@ -309,73 +297,57 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) } } #endif - - if( i_ret > 0 ) - p_access->info.i_pos += i_ret; - else if( i_ret == 0 ) - p_access->info.b_eof = VLC_TRUE; - return i_ret; } + /***************************************************************************** * Seek: seek to a specific location in a file *****************************************************************************/ static int Seek (access_t *p_access, int64_t i_pos) { - if (i_pos > p_access->info.i_size) - { - msg_Err (p_access, "seeking too far"); - i_pos = p_access->info.i_size; - } - else if (i_pos < 0) - { - msg_Err (p_access, "seeking too early"); - i_pos = 0; - } - p_access->info.i_pos = i_pos; - p_access->info.b_eof = VLC_FALSE; + p_access->info.b_eof = false; - /* Determine which file we need to access */ lseek (p_access->p_sys->fd, i_pos, SEEK_SET); return VLC_SUCCESS; } +static int NoSeek (access_t *p_access, int64_t i_pos) +{ + /* assert(0); ?? */ + (void) p_access; (void) i_pos; + return VLC_EGENERIC; +} + /***************************************************************************** * Control: *****************************************************************************/ static int Control( access_t *p_access, int i_query, va_list args ) { access_sys_t *p_sys = p_access->p_sys; - vlc_bool_t *pb_bool; - int *pi_int; - int64_t *pi_64; + bool *pb_bool; + int64_t *pi_64; switch( i_query ) { /* */ case ACCESS_CAN_SEEK: case ACCESS_CAN_FASTSEEK: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = p_sys->b_seekable; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = (p_access->pf_seek != NoSeek); break; case ACCESS_CAN_PAUSE: case ACCESS_CAN_CONTROL_PACE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + pb_bool = (bool*)va_arg( args, bool* ); *pb_bool = p_sys->b_pace_control; break; /* */ - case ACCESS_GET_MTU: - pi_int = (int*)va_arg( args, int * ); - *pi_int = 0; - break; - case ACCESS_GET_PTS_DELAY: pi_64 = (int64_t*)va_arg( args, int64_t * ); - *pi_64 = var_GetInteger( p_access, "file-caching" ) * I64C(1000); + *pi_64 = var_GetInteger( p_access, "file-caching" ) * INT64_C(1000); break; /* */ @@ -388,79 +360,48 @@ static int Control( access_t *p_access, int i_query, va_list args ) case ACCESS_SET_SEEKPOINT: case ACCESS_SET_PRIVATE_ID_STATE: case ACCESS_GET_META: + case ACCESS_GET_PRIVATE_ID_STATE: + case ACCESS_GET_CONTENT_TYPE: return VLC_EGENERIC; default: - msg_Warn( p_access, "unimplemented query in control" ); + msg_Warn( p_access, "unimplemented query %d in control", i_query ); return VLC_EGENERIC; } return VLC_SUCCESS; } - -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); -} - - /***************************************************************************** * open_file: Opens a specific file *****************************************************************************/ -static int open_file (access_t *p_access, const char *psz_name) +static int open_file (access_t *p_access, const char *path) { - char *path = expand_path (p_access, psz_name); - -#ifdef UNDER_CE - 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; - } +#if defined(WIN32) + if (!strcasecmp (p_access->psz_access, "file") + && ('/' == path[0]) && isalpha (path[1]) + && (':' == path[2]) && ('/' == path[3])) + /* Explorer can open path such as file:/C:/ or file:///C:/ + * hence remove leading / if found */ + path++; +#endif - fseek( p_sys->fd, 0, SEEK_END ); - p_access->info.i_size = ftell( p_sys->fd ); - p_access->info.i_update |= INPUT_UPDATE_SIZE; - fseek( p_sys->fd, 0, SEEK_SET ); -#else int fd = utf8_open (path, O_RDONLY | O_NONBLOCK /* O_LARGEFILE*/, 0666); if (fd == -1) { - 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)); + msg_Err (p_access, "cannot open file %s (%m)", path); + dialog_Fatal (p_access, _("File reading failed"), + _("VLC could not open the file \"%s\"."), path); return -1; } -# if defined(HAVE_FCNTL_H) && defined(F_FDAHEAD) && defined(F_NOCACHE) +#if defined(HAVE_FCNTL) /* We'd rather use any available memory for reading ahead * than for caching what we've already seen/heard */ +# if defined(F_RDAHEAD) fcntl (fd, F_RDAHEAD, 1); +# endif +# if defined(F_NOCACHE) fcntl (fd, F_NOCACHE, 1); # endif #endif