X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Ffile.c;h=d0dd7c28884a90f0f290691197f43a110973f87e;hb=5af94ab9f6696cdf3caa48c5f3aeaa7e12842faf;hp=cc7da19e254e96be8c7f49ebfb66ead066261aa1;hpb=2c87bceb5da1413470a8e22e38cd654e6439fad5;p=vlc diff --git a/modules/access/file.c b/modules/access/file.c index cc7da19e25..d0dd7c2888 100644 --- a/modules/access/file.c +++ b/modules/access/file.c @@ -23,38 +23,45 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -/***************************************************************************** - * Preamble - *****************************************************************************/ #ifdef HAVE_CONFIG_H # include "config.h" #endif #include -#include +#include "fs.h" #include #include #include #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif +#include #ifdef HAVE_SYS_STAT_H # include #endif #ifdef HAVE_FCNTL_H # include #endif +#ifdef HAVE_FSTATVFS +# include +# if defined (HAVE_SYS_MOUNT_H) +# include +# include +# endif +#endif +#ifdef HAVE_LINUX_MAGIC_H +# include +# include +#endif #if defined( WIN32 ) # include # include +# include #else # include -# include #endif +#include #if defined( WIN32 ) && !defined( UNDER_CE ) # ifdef lseek @@ -63,46 +70,11 @@ # define lseek _lseeki64 #elif defined( UNDER_CE ) /* FIXME the commandline on wince is a mess */ -# define dup(a) -1 +# define PathIsNetworkPathW(wpath) (! wcsncmp(wpath, L"\\\\", 2)) #endif -#include - -/***************************************************************************** - * Module descriptor - *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close( vlc_object_t * ); - -#define CACHING_TEXT N_("Caching value in ms") -#define CACHING_LONGTEXT N_( \ - "Caching value for files. This " \ - "value should be set in milliseconds." ) - -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 ) - 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 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 * ); +#include +#include struct access_sys_t { @@ -111,42 +83,108 @@ struct access_sys_t int fd; /* */ + unsigned caching; bool b_pace_control; }; +#ifndef WIN32 +static bool IsRemote (int fd) +{ +#if defined (HAVE_FSTATVFS) && defined (MNT_LOCAL) + struct statvfs stf; + + if (fstatvfs (fd, &stf)) + return false; + /* fstatvfs() is in POSIX, but MNT_LOCAL is not */ + return !(stf.f_flag & MNT_LOCAL); + +#elif defined (HAVE_LINUX_MAGIC_H) + struct statfs stf; + + if (fstatfs (fd, &stf)) + return false; + + switch ((unsigned long)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; + +#else + (void)fd; + return false; + +#endif +} +#endif + +#ifndef HAVE_POSIX_FADVISE +# define posix_fadvise(fd, off, len, adv) +#endif + /***************************************************************************** * Open: open the file *****************************************************************************/ -static int Open( vlc_object_t *p_this ) +int Open( vlc_object_t *p_this ) { access_t *p_access = (access_t*)p_this; - access_sys_t *p_sys; - - /* 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_pace_control = true; +#ifdef WIN32 + bool is_remote = false; +#endif /* Open file */ int fd = -1; if (!strcasecmp (p_access->psz_access, "fd")) - fd = dup (atoi (p_access->psz_path)); - else if (!strcmp (p_access->psz_path, "-")) - fd = dup (0); + { + char *end; + int oldfd = strtol (p_access->psz_location, &end, 10); + + if (*end == '\0') + fd = vlc_dup (oldfd); + else if (*end == '/' && end > p_access->psz_location) + { + char *name = decode_URI_duplicate (end - 1); + if (name != NULL) + { + name[0] = '.'; + fd = vlc_openat (oldfd, name, O_RDONLY | O_NONBLOCK); + free (name); + } + } + } else { - msg_Dbg (p_access, "opening file `%s'", p_access->psz_path); - fd = open_file (p_access, p_access->psz_path); + const char *path = p_access->psz_filepath; + + msg_Dbg (p_access, "opening file `%s'", path); + fd = vlc_open (path, O_RDONLY | O_NONBLOCK); + if (fd == -1) + { + 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); + } + +#ifdef WIN32 + wchar_t wpath[MAX_PATH+1]; + if (MultiByteToWideChar (CP_UTF8, 0, path, -1, + wpath, MAX_PATH) + && PathIsNetworkPathW (wpath)) + is_remote = true; +# define IsRemote( fd ) ((void)fd, is_remote) +#endif } if (fd == -1) - goto error; + return VLC_EGENERIC; -#ifdef HAVE_SYS_STAT_H struct stat st; - if (fstat (fd, &st)) { msg_Err (p_access, "failed to read (%m)"); @@ -156,9 +194,33 @@ static int Open( vlc_object_t *p_this ) * how to parse the data. The directory plugin will do it. */ if (S_ISDIR (st.st_mode)) { +#ifdef HAVE_FDOPENDIR + DIR *handle = fdopendir (fd); + if (handle == NULL) + goto error; /* Uh? */ + return DirInit (p_access, handle); +#else msg_Dbg (p_access, "ignoring directory"); goto error; +#endif } + + access_sys_t *p_sys = malloc (sizeof (*p_sys)); + if (unlikely(p_sys == NULL)) + goto error; + access_InitFields (p_access); + p_access->pf_read = FileRead; + p_access->pf_block = NULL; + p_access->pf_control = FileControl; + p_access->pf_seek = FileSeek; + p_access->p_sys = p_sys; + p_sys->i_nb_reads = 0; + p_sys->fd = fd; + p_sys->caching = var_CreateGetInteger (p_access, "file-caching"); + if (IsRemote(fd)) + p_sys->caching += var_CreateGetInteger (p_access, "network-caching"); + p_sys->b_pace_control = true; + if (S_ISREG (st.st_mode)) p_access->info.i_size = st.st_size; else if (!S_ISBLK (st.st_mode)) @@ -166,26 +228,44 @@ static int Open( vlc_object_t *p_this ) p_access->pf_seek = NoSeek; p_sys->b_pace_control = strcasecmp (p_access->psz_access, "stream"); } -#else -# warning File size not known! -#endif - p_sys->fd = fd; + if (p_access->pf_seek != NoSeek) + { + /* Demuxers will need the beginning of the file for probing. */ + posix_fadvise (fd, 0, 4096, POSIX_FADV_WILLNEED); + /* In most cases, we only read the file once. */ + posix_fadvise (fd, 0, 0, POSIX_FADV_NOREUSE); +#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 + } return VLC_SUCCESS; error: - if (fd != -1) - close (fd); - free (p_sys); + close (fd); return VLC_EGENERIC; } /***************************************************************************** * Close: close the target *****************************************************************************/ -static void Close (vlc_object_t * p_this) +void Close (vlc_object_t * p_this) { access_t *p_access = (access_t*)p_this; + + if (p_access->pf_read == NULL) + { + DirClose (p_this); + return; + } + access_sys_t *p_sys = p_access->p_sys; close (p_sys->fd); @@ -198,7 +278,7 @@ static void Close (vlc_object_t * p_this) /***************************************************************************** * Read: standard read on a file descriptor. *****************************************************************************/ -static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) +ssize_t FileRead( access_t *p_access, uint8_t *p_buffer, size_t i_len ) { access_sys_t *p_sys = p_access->p_sys; int fd = p_sys->fd; @@ -234,20 +314,20 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t 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 ) + 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)) { +#ifdef HAVE_SYS_STAT_H struct stat st; if ((fstat (fd, &st) == 0) - && (p_access->info.i_size != st.st_size)) + && (p_access->info.i_size != (uint64_t)st.st_size)) { p_access->info.i_size = st.st_size; p_access->info.i_update |= INPUT_UPDATE_SIZE; } - } #endif + } return i_ret; } @@ -255,7 +335,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) /***************************************************************************** * Seek: seek to a specific location in a file *****************************************************************************/ -static int Seek (access_t *p_access, int64_t i_pos) +int FileSeek (access_t *p_access, uint64_t i_pos) { p_access->info.i_pos = i_pos; p_access->info.b_eof = false; @@ -264,7 +344,7 @@ static int Seek (access_t *p_access, int64_t i_pos) return VLC_SUCCESS; } -static int NoSeek (access_t *p_access, int64_t i_pos) +int NoSeek (access_t *p_access, uint64_t i_pos) { /* assert(0); ?? */ (void) p_access; (void) i_pos; @@ -274,7 +354,7 @@ static int NoSeek (access_t *p_access, int64_t i_pos) /***************************************************************************** * Control: *****************************************************************************/ -static int Control( access_t *p_access, int i_query, va_list args ) +int FileControl( access_t *p_access, int i_query, va_list args ) { access_sys_t *p_sys = p_access->p_sys; bool *pb_bool; @@ -298,7 +378,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) /* */ case ACCESS_GET_PTS_DELAY: pi_64 = (int64_t*)va_arg( args, int64_t * ); - *pi_64 = var_GetInteger( p_access, "file-caching" ) * INT64_C(1000); + *pi_64 = p_sys->caching * INT64_C(1000); break; /* */ @@ -322,40 +402,3 @@ static int Control( access_t *p_access, int i_query, va_list args ) } return VLC_SUCCESS; } - -/***************************************************************************** - * open_file: Opens a specific file - *****************************************************************************/ -static int open_file (access_t *p_access, const char *path) -{ -#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 - - int fd = utf8_open (path, O_RDONLY | O_NONBLOCK /* O_LARGEFILE*/, 0666); - if (fd == -1) - { - 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) - /* 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 - - return fd; -}