#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;
- const char *path = p_access->psz_path;
+ const char *path = p_access->psz_filepath;
#ifdef WIN32
bool is_remote = false;
#endif
int oldfd = strtol (path, &end, 10);
if (*end == '\0')
- {
- fd = dup (oldfd);
- if (fd != -1)
- lseek (fd, 0, SEEK_SET);
- }
-#ifdef HAVE_FDOPENDIR
+ fd = vlc_dup (oldfd);
else if (*end == '/' && end > path)
{
char *name = decode_URI_duplicate (end - 1);
- if (name != NULL) /* TODO: ToLocale(), FD_CLOEXEC */
+ if (name != NULL)
{
name[0] = '.';
- fd = openat (oldfd, name, O_RDONLY | O_NONBLOCK);
+ fd = vlc_openat (oldfd, name, O_RDONLY | O_NONBLOCK);
free (name);
}
}
-#endif
}
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);
* how to parse the data. The directory plugin will do it. */
if (S_ISDIR (st.st_mode))
{
- if (!strcasecmp (p_access->psz_access, "fd"))
- goto error; /* fd:// not supported for directories yet */
#ifdef HAVE_FDOPENDIR
DIR *handle = fdopendir (fd);
if (handle == NULL)
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;