# include "config.h"
#endif
-#include <vlc_common.h>
-#include "fs.h"
-#include <vlc_input.h>
-#include <vlc_access.h>
-#include <vlc_dialog.h>
-
#include <assert.h>
#include <errno.h>
#include <sys/types.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#ifdef HAVE_FSTATVFS
+# include <sys/statvfs.h>
+# if defined (HAVE_SYS_MOUNT_H)
+# include <sys/param.h>
+# include <sys/mount.h>
+# endif
#endif
-#if defined (__linux__)
-# include <sys/vfs.h>
#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>
# undef lseek
# endif
# define lseek _lseeki64
-#elif defined( UNDER_CE )
-/* FIXME the commandline on wince is a mess */
-# define PathIsNetworkPathW(wpath) (! wcsncmp(wpath, L"\\\\", 2))
#endif
+#include <vlc_common.h>
+#include "fs.h"
+#include <vlc_input.h>
+#include <vlc_access.h>
+#include <vlc_dialog.h>
+#ifdef WIN32
+# include <vlc_charset.h>
+#endif
#include <vlc_fs.h>
#include <vlc_url.h>
int fd;
/* */
- unsigned caching;
bool b_pace_control;
};
-#ifndef WIN32
+#if !defined (WIN32) && !defined (__OS2__)
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:
return true;
}
return false;
-# endif
-#endif
-#else /* !HAVE_FSTATFS */
+
+#else
(void)fd;
return false;
#endif
}
+# define IsRemote(fd,path) IsRemote(fd)
+
+#else /* WIN32 || __OS2__ */
+static bool IsRemote (const char *path)
+{
+# if !defined(UNDER_CE) && !defined(__OS2__)
+ wchar_t *wpath = ToWide (path);
+ bool is_remote = (wpath != NULL && PathIsNetworkPathW (wpath));
+ free (wpath);
+ return is_remote;
+# else
+ return (! strncmp(path, "\\\\", 2));
+# endif
+}
+# define IsRemote(fd,path) IsRemote(path)
#endif
#ifndef HAVE_POSIX_FADVISE
#endif
/*****************************************************************************
- * Open: open the file
+ * FileOpen: open the file
*****************************************************************************/
-int Open( vlc_object_t *p_this )
+int FileOpen( vlc_object_t *p_this )
{
access_t *p_access = (access_t*)p_this;
- const char *path = p_access->psz_path;
-#ifdef WIN32
- bool is_remote = false;
-#endif
/* Open file */
int fd = -1;
if (!strcasecmp (p_access->psz_access, "fd"))
{
char *end;
- int oldfd = strtol (path, &end, 10);
+ int oldfd = strtol (p_access->psz_location, &end, 10);
if (*end == '\0')
fd = vlc_dup (oldfd);
- else if (*end == '/' && end > path)
+ else if (*end == '/' && end > p_access->psz_location)
{
char *name = decode_URI_duplicate (end - 1);
if (name != NULL)
}
else
{
+ const char *path = p_access->psz_filepath;
+
msg_Dbg (p_access, "opening file `%s'", path);
fd = vlc_open (path, O_RDONLY | O_NONBLOCK);
if (fd == -1)
{
msg_Err (p_access, "cannot open file %s (%m)", path);
dialog_Fatal (p_access, _("File reading failed"),
- _("VLC could not open the file \"%s\"."), path);
+ _("VLC could not open the file \"%s\". (%m)"), path);
}
-
-#ifdef WIN32
- wchar_t wpath[MAX_PATH+1];
- if (MultiByteToWideChar (CP_UTF8, 0, path, -1,
- wpath, MAX_PATH)
- && PathIsNetworkPathW (wpath))
- is_remote = true;
-# define IsRemote( fd ) ((void)fd, is_remote)
-#endif
}
if (fd == -1)
return VLC_EGENERIC;
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))
}
/*****************************************************************************
- * Close: close the target
+ * FileClose: close the target
*****************************************************************************/
-void Close (vlc_object_t * p_this)
+void FileClose (vlc_object_t * p_this)
{
access_t *p_access = (access_t*)p_this;
int fd = p_sys->fd;
ssize_t i_ret;
-#ifndef WIN32
+#if !defined (WIN32) && !defined (__OS2__)
if (p_access->pf_seek == NoSeek)
i_ret = net_Read (p_access, fd, NULL, p_buffer, i_len, false);
else
default:
msg_Err (p_access, "failed to read (%m)");
- dialog_Fatal (p_access, _("File reading failed"), "%s",
- _("VLC could not read the file."));
+ dialog_Fatal (p_access, _("File reading failed"),
+ _("VLC could not read the file (%m)."));
p_access->info.b_eof = true;
return 0;
}
if ((p_access->info.i_size && !(p_sys->i_nb_reads % INPUT_FSTAT_NB_READS))
|| (p_access->info.i_pos > p_access->info.i_size))
{
-#ifdef HAVE_SYS_STAT_H
struct stat st;
if ((fstat (fd, &st) == 0)
p_access->info.i_size = st.st_size;
p_access->info.i_update |= INPUT_UPDATE_SIZE;
}
-#endif
}
return i_ret;
}
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = p_sys->caching * INT64_C(1000);
+ if (IsRemote (p_sys->fd, p_access->psz_filepath))
+ *pi_64 = var_InheritInteger (p_access, "network-caching");
+ else
+ *pi_64 = var_InheritInteger (p_access, "file-caching");
+ *pi_64 *= 1000;
break;
/* */
projects / vlc / blobdiff