X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Ffile.c;h=91f2a84da0c1de0b88f2e73d6d7e37f69ac2f23f;hb=2b9b5c0c6b7a9de32d5a42755f648d5194afaf13;hp=29228dc45bca58c3afe4befe9a847e2b08355b97;hpb=3561b9b28f58eb7a4183e158a8fd973800d31ceb;p=vlc diff --git a/modules/access/file.c b/modules/access/file.c index 29228dc45b..91f2a84da0 100644 --- a/modules/access/file.c +++ b/modules/access/file.c @@ -48,7 +48,7 @@ # include #endif -#if defined( WIN32 ) && !defined( UNDER_CE ) +#if defined( WIN32 ) # include # include #else @@ -62,15 +62,8 @@ # 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 @@ -86,25 +79,25 @@ static void Close( vlc_object_t * ); "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( "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 ) + add_obsolete_string( "file-cat" ) + set_capability( "access", 50 ) + add_shortcut( "file" ) + 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 ); @@ -113,12 +106,10 @@ static int open_file( access_t *, const char * ); struct access_sys_t { unsigned int i_nb_reads; - bool b_kfir; int fd; /* */ - bool b_seekable; bool b_pace_control; }; @@ -137,72 +128,56 @@ static int Open( vlc_object_t *p_this ) STANDARD_READ_ACCESS_INIT; p_sys->i_nb_reads = 0; - p_sys->b_kfir = false; - int fd = p_sys->fd = -1; if (!strcasecmp (p_access->psz_access, "stream")) - { - p_sys->b_seekable = false; p_sys->b_pace_control = false; - } - else if (!strcasecmp (p_access->psz_access, "kfir")) - { - p_sys->b_seekable = false; - p_sys->b_pace_control = false; - p_sys->b_kfir = true; - } else - { - p_sys->b_seekable = 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) fd = dup (0); else 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): %m", fd); - 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; } - 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)) - p_sys->b_seekable = false; + 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; #else - p_sys->b_seekable = !b_stdin; + if (b_stdin) + p_access->pf_seek = NoSeek; # warning File size not known! #endif + p_sys->fd = fd; return VLC_SUCCESS; + +error: + if (fd != -1) + close (fd); + free (p_sys); + return VLC_EGENERIC; } /***************************************************************************** @@ -217,52 +192,24 @@ static void Close (vlc_object_t * p_this) free (p_sys); } + +#include + /***************************************************************************** * Read: standard read on a file descriptor. *****************************************************************************/ 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; - ssize_t 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 ) { @@ -273,15 +220,17 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) break; default: - msg_Err (p_access, "read failed (%m)"); + msg_Err (p_access, "failed to read (%m)"); intf_UserFatal (p_access, false, _("File reading failed"), _("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++; @@ -299,12 +248,6 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) } } #endif - - if( i_ret > 0 ) - p_access->info.i_pos += i_ret; - else if( i_ret == 0 ) - p_access->info.b_eof = true; - return i_ret; } @@ -321,15 +264,21 @@ 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) +{ + /* 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; - bool *pb_bool; - int *pi_int; - int64_t *pi_64; + bool *pb_bool; + int64_t *pi_64; switch( i_query ) { @@ -337,7 +286,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) case ACCESS_CAN_SEEK: case ACCESS_CAN_FASTSEEK: pb_bool = (bool*)va_arg( args, bool* ); - *pb_bool = p_sys->b_seekable; + *pb_bool = (p_access->pf_seek != NoSeek); break; case ACCESS_CAN_PAUSE: @@ -347,11 +296,6 @@ static int Control( access_t *p_access, int i_query, va_list args ) 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" ) * INT64_C(1000); @@ -393,21 +337,6 @@ static int open_file (access_t *p_access, const char *path) path++; #endif -#ifdef UNDER_CE - p_sys->fd = utf8_fopen( path, "rb" ); - if ( !p_sys->fd ) - { - msg_Err( p_access, "cannot open file %s", path ); - intf_UserFatal( p_access, false, _("File reading failed"), - _("VLC could not open the file \"%s\"."), path ); - return VLC_EGENERIC; - } - - 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) { @@ -417,10 +346,13 @@ static int open_file (access_t *p_access, const char *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