/*****************************************************************************
* file.c: file input (file: access plug-in)
*****************************************************************************
- * Copyright (C) 2001-2004 the VideoLAN team
+ * Copyright (C) 2001-2006 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
+ * Rémi Denis-Courmont <rem # videolan # org>
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
# include <fcntl.h>
#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#elif defined( WIN32 ) && !defined( UNDER_CE )
+#if defined( WIN32 ) && !defined( UNDER_CE )
# include <io.h>
+#else
+# include <unistd.h>
+# include <poll.h>
#endif
#if defined( WIN32 ) && !defined( UNDER_CE )
#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 );
{
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 );
+ asprintf( &psz, "%s/%s", p_access->p_vlc->psz_homedir, psz_name + 2 );
free( psz_name );
psz_name = psz;
}
#endif
#ifdef HAVE_SYS_STAT_H
- psz = ToLocale( psz_name );
- if( stat( psz, &stat_info ) )
+ if( utf8_stat( psz_name, &stat_info ) )
{
msg_Warn( p_access, "%s: %s", psz_name, strerror( errno ) );
- LocaleFree( psz );
free( psz_name );
return VLC_EGENERIC;
}
- LocaleFree( psz );
#endif
}
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 = p_sys->fd;
+ ufd.events = POLLIN;
+
+ i_ret = poll( &ufd, 1, 500 );
+ if( i_ret == -1 )
+ {
+ if( errno != EINTR )
+ {
+ msg_Err( p_access, "poll error: %s",
+ strerror( errno ) );
+ return -1;
+ }
+ i_ret = 0;
+ }
}
+ while( i_ret == 0 );
i_ret = read( p_sys->fd, p_buffer, i_len );
}
static int _OpenFile( 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 );
#ifdef UNDER_CE
- p_sys->fd = fopen( psz_localname, "rb" );
- LocaleFree( psz_localname );
+ p_sys->fd = utf8_fopen( psz_name, "rb" );
if ( !p_sys->fd )
{
msg_Err( p_access, "cannot open file %s", psz_name );
p_access->info.i_update |= INPUT_UPDATE_SIZE;
fseek( p_sys->fd, 0, SEEK_SET );
#else
+ const char *psz_localname = ToLocale( psz_name );
+ if( psz_localname == NULL )
+ {
+ msg_Err( p_access, "incorrect file name %s", psz_name );
+ return VLC_EGENERIC;
+ }
+ // FIXME: support non-ANSI filenames on Win32
p_sys->fd = open( psz_localname, O_NONBLOCK /*| O_LARGEFILE*/ );
LocaleFree( psz_localname );
+
if ( p_sys->fd == -1 )
{
msg_Err( p_access, "cannot open file %s (%s)", psz_name,
return VLC_EGENERIC;
}
-#ifdef HAVE_FCNTL_H
+#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);
projects / vlc / blobdiff