Commit 602f2d42 authored by Geoffroy Couprie's avatar Geoffroy Couprie

WinCE: factorize the file access code (and make it work)

parent 272308b2
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
# include <fcntl.h> # include <fcntl.h>
#endif #endif
#if defined( WIN32 ) && !defined( UNDER_CE ) #if defined( WIN32 )
# include <io.h> # include <io.h>
# include <ctype.h> # include <ctype.h>
#else #else
...@@ -62,15 +62,8 @@ ...@@ -62,15 +62,8 @@
# endif # endif
# define lseek _lseeki64 # define lseek _lseeki64
#elif defined( UNDER_CE ) #elif defined( UNDER_CE )
# ifdef read /* FIXME the commandline on wince is a mess */
# undef read # define dup(a) -1
# endif
# define read(a,b,c) fread(b,1,c,a)
# define close(a) fclose(a)
# ifdef lseek
# undef lseek
# endif
# define lseek fseek
#endif #endif
#include <vlc_charset.h> #include <vlc_charset.h>
...@@ -348,21 +341,6 @@ static int open_file (access_t *p_access, const char *path) ...@@ -348,21 +341,6 @@ static int open_file (access_t *p_access, const char *path)
path++; path++;
#endif #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); int fd = utf8_open (path, O_RDONLY | O_NONBLOCK /* O_LARGEFILE*/, 0666);
if (fd == -1) if (fd == -1)
{ {
...@@ -378,7 +356,6 @@ static int open_file (access_t *p_access, const char *path) ...@@ -378,7 +356,6 @@ static int open_file (access_t *p_access, const char *path)
fcntl (fd, F_RDAHEAD, 1); fcntl (fd, F_RDAHEAD, 1);
fcntl (fd, F_NOCACHE, 1); fcntl (fd, F_NOCACHE, 1);
# endif # endif
#endif
return fd; return fd;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment