X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_fs.h;h=533aa9bc91d51d0dbad6d79118a0ed8de3b3506e;hb=0df73cebc001e201d588a81119ba31106a11d340;hp=56d2f57d32eddfa4c7c085a37aa309c1b4740410;hpb=86c91b1fbe47c58adbb0808353f3b9d8fdf41b39;p=vlc

diff --git a/include/vlc_fs.h b/include/vlc_fs.h
index 56d2f57d32..533aa9bc91 100644
--- a/include/vlc_fs.h
+++ b/include/vlc_fs.h
@@ -3,19 +3,19 @@
  *****************************************************************************
  * Copyright © 2006-2010 Rémi Denis-Courmont
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VLC_FS_H
@@ -31,28 +31,40 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-VLC_EXPORT( int, vlc_open, ( const char *filename, int flags, ... ) LIBVLC_USED );
-VLC_EXPORT( FILE *, vlc_fopen, ( const char *filename, const char *mode ) LIBVLC_USED );
-VLC_EXPORT( int, vlc_openat, ( int fd, const char *filename, int flags, ... ) LIBVLC_USED );
+VLC_API int vlc_open( const char *filename, int flags, ... ) VLC_USED;
+VLC_API FILE * vlc_fopen( const char *filename, const char *mode ) VLC_USED;
+VLC_API int vlc_openat( int fd, const char *filename, int flags, ... ) VLC_USED;
 
-VLC_EXPORT( DIR *, vlc_opendir, ( const char *dirname ) LIBVLC_USED );
-VLC_EXPORT( char *, vlc_readdir, ( DIR *dir ) LIBVLC_USED );
-VLC_EXPORT( int, vlc_loaddir, ( DIR *dir, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
-VLC_EXPORT( int, vlc_scandir, ( const char *dirname, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) ) );
-VLC_EXPORT( int, vlc_mkdir, ( const char *filename, mode_t mode ) );
+VLC_API DIR * vlc_opendir( const char *dirname ) VLC_USED;
+VLC_API char * vlc_readdir( DIR *dir ) VLC_USED;
+VLC_API int vlc_loaddir( DIR *dir, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) );
+VLC_API int vlc_scandir( const char *dirname, char ***namelist, int (*select)( const char * ), int (*compar)( const char **, const char ** ) );
+VLC_API int vlc_mkdir( const char *filename, mode_t mode );
 
-VLC_EXPORT( int, vlc_unlink, ( const char *filename ) );
-VLC_EXPORT( int, vlc_rename, ( const char *oldpath, const char *newpath ) );
+VLC_API int vlc_unlink( const char *filename );
+VLC_API int vlc_rename( const char *oldpath, const char *newpath );
+VLC_API char *vlc_getcwd( void ) VLC_USED;
+
+#if defined( _WIN32 )
+typedef struct vlc_DIR
+{
+    _WDIR *wdir; /* MUST be first, see <vlc_fs.h> */
+    char *entry;
+    union
+    {
+        DWORD drives;
+        bool insert_dot_dot;
+    } u;
+} vlc_DIR;
 
-#if defined( WIN32 )
-# ifndef UNDER_CE
-#  define stat _stati64
-# endif
 static inline int vlc_closedir( DIR *dir )
 {
-    _WDIR *wdir = *(_WDIR **)dir;
-    free( dir );
-    return wdir ? _wclosedir( wdir ) : 0;
+    vlc_DIR *vdir = (vlc_DIR *)dir;
+    _WDIR *wdir = vdir->wdir;
+
+    free( vdir->entry );
+    free( vdir );
+    return (wdir != NULL) ? _wclosedir( wdir ) : 0;
 }
 # undef closedir
 # define closedir vlc_closedir
@@ -65,12 +77,31 @@ static inline void vlc_rewinddir( DIR *dir )
 }
 # undef rewinddir
 # define rewinddir vlc_rewinddir
+
+# include <sys/stat.h>
+# ifndef stat
+#  define stat _stati64
+# endif
+# ifndef fstat
+#  define fstat _fstati64
+# endif
+# ifndef _MSC_VER
+#  undef lseek
+#  define lseek _lseeki64
+# endif
 #endif
 
-VLC_EXPORT( int, vlc_stat, ( const char *filename, struct stat *buf ) );
-VLC_EXPORT( int, vlc_lstat, ( const char *filename, struct stat *buf ) );
+#ifdef __ANDROID__
+# define lseek lseek64
+#endif
+
+struct stat;
+
+VLC_API int vlc_stat( const char *filename, struct stat *buf );
+VLC_API int vlc_lstat( const char *filename, struct stat *buf );
 
-VLC_EXPORT( int, vlc_mkstemp, ( char * ) );
+VLC_API int vlc_mkstemp( char * );
 
-VLC_EXPORT( int, vlc_dup, ( int ) );
+VLC_API int vlc_dup( int );
+VLC_API int vlc_pipe( int[2] );
 #endif