#include <assert.h>
#include <errno.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
-#if defined (__linux__)
-# include <sys/vfs.h>
+#ifdef HAVE_FSTATVFS
+# include <sys/statvfs.h>
+# if defined (HAVE_SYS_MOUNT_H)
+# include <sys/param.h>
+# include <sys/mount.h>
+# endif
+#endif
#ifdef HAVE_LINUX_MAGIC_H
+# include <sys/vfs.h>
# include <linux/magic.h>
#endif
-#elif defined (HAVE_SYS_MOUNT_H)
-# include <sys/param.h>
-# include <sys/mount.h>
-#endif
#if defined( WIN32 )
# include <io.h>
# include <shlwapi.h>
#else
# include <unistd.h>
-# include <poll.h>
#endif
+#include <dirent.h>
#if defined( WIN32 ) && !defined( UNDER_CE )
# ifdef lseek
# 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 <vlc_charset.h>
+#include <vlc_fs.h>
+#include <vlc_url.h>
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)
{
case AFS_SUPER_MAGIC:
return true;
}
return false;
-# endif
-#endif
-#else /* !HAVE_FSTATFS */
+
+#else
(void)fd;
return false;
int Open( vlc_object_t *p_this )
{
access_t *p_access = (access_t*)p_this;
- access_sys_t *p_sys = malloc (sizeof (*p_sys));
- const char *path = p_access->psz_path;
+ const char *path = p_access->psz_filepath;
#ifdef WIN32
bool is_remote = false;
#endif
- if (unlikely(p_sys == NULL))
- return VLC_ENOMEM;
-
- 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->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 (path, &end, 10);
+
+ if (*end == '\0')
+ fd = vlc_dup (oldfd);
+ else if (*end == '/' && end > path)
+ {
+ 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'", 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);
#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)");
* 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))
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)
{
return VLC_SUCCESS;
error:
- if (fd != -1)
- close (fd);
- free (p_sys);
+ close (fd);
return VLC_EGENERIC;
}
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);
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;
/*****************************************************************************
* Seek: seek to a specific location in a file
*****************************************************************************/
-int FileSeek (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;
return VLC_SUCCESS;
}
-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;
projects / vlc / blobdiff