X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Ffile.c;h=59f6c6790ed81aa00b2e6a67ed5814f0c4251993;hb=bc09c365ab435fda0185e60a423f69d6dfa348c8;hp=27632386d8fbfd2f4e0e1961508bf336d7d3d44d;hpb=a774b53507349e9641e098c705c9f9dd29f463d5;p=vlc diff --git a/modules/access/file.c b/modules/access/file.c index 27632386d8..59f6c6790e 100644 --- a/modules/access/file.c +++ b/modules/access/file.c @@ -23,39 +23,36 @@ * 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 -#if defined (__linux__) -# include +#ifdef HAVE_FSTATVFS +# include +# if defined (HAVE_SYS_MOUNT_H) +# include +# include +# endif +#endif #ifdef HAVE_LINUX_MAGIC_H +# include # include #endif -#elif defined (HAVE_SYS_MOUNT_H) -# include -# include -#endif #if defined( WIN32 ) # include @@ -63,8 +60,8 @@ # include #else # include -# include #endif +#include #if defined( WIN32 ) && !defined( UNDER_CE ) # ifdef lseek @@ -73,53 +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 (ms)") -#define CACHING_LONGTEXT N_( \ - "Caching value for files, in milliseconds." ) - -#define NETWORK_CACHING_TEXT N_("Extra network caching value (ms)") -#define NETWORK_CACHING_LONGTEXT N_( \ - "Supplementary caching value for remote files, 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 ) - change_safe() - add_integer( "network-caching", 3 * DEFAULT_PTS_DELAY / 1000, NULL, - NETWORK_CACHING_TEXT, NETWORK_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 NoSeek( access_t *, int64_t ); -static ssize_t Read( access_t *, uint8_t *, size_t ); -static int Control( access_t *, int, va_list ); +#include +#include struct access_sys_t { @@ -135,18 +90,21 @@ struct access_sys_t #ifndef WIN32 static bool IsRemote (int fd) { -#ifdef HAVE_FSTATFS +#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; -#if defined(MNT_LOCAL) - return !(stf.f_flags & MNT_LOCAL); - -#else -# ifdef HAVE_LINUX_MAGIC_H - switch (stf.f_type) + switch ((unsigned long)stf.f_type) { case AFS_SUPER_MAGIC: case CODA_SUPER_MAGIC: @@ -157,9 +115,8 @@ static bool IsRemote (int fd) return true; } return false; -# endif -#endif -#else /* !HAVE_FSTATFS */ + +#else (void)fd; return false; @@ -174,30 +131,40 @@ static bool IsRemote (int fd) /***************************************************************************** * 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; - const char *path = p_access->psz_path; #ifdef WIN32 bool is_remote = false; #endif - STANDARD_READ_ACCESS_INIT; - p_sys->i_nb_reads = 0; - p_sys->b_pace_control = true; - /* Open file */ int fd = -1; if (!strcasecmp (p_access->psz_access, "fd")) - fd = dup (atoi (path)); - else if (!strcmp (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 { + const char *path = p_access->psz_filepath; + msg_Dbg (p_access, "opening file `%s'", path); - fd = utf8_open (path, O_RDONLY | O_NONBLOCK); + fd = vlc_open (path, O_RDONLY | O_NONBLOCK); if (fd == -1) { msg_Err (p_access, "cannot open file %s (%m)", path); @@ -215,11 +182,9 @@ static int Open( vlc_object_t *p_this ) #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)"); @@ -229,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_InheritInteger (p_access, "file-caching"); + if (IsRemote(fd)) + p_sys->caching += var_InheritInteger (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)) @@ -239,15 +228,6 @@ 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->caching = var_CreateGetInteger (p_access, "file-caching"); - if (IsRemote(fd)) - p_sys->caching += var_CreateGetInteger (p_access, "network-caching"); - - p_sys->fd = fd; if (p_access->pf_seek != NoSeek) { @@ -269,18 +249,23 @@ static int Open( vlc_object_t *p_this ) 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); @@ -293,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; @@ -336,7 +321,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) 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; @@ -350,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; @@ -359,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; @@ -369,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;