getting stuff working on windows again

[vg.git] / vg_io.h

diff --git a/vg_io.h b/vg_io.h
index af1554b3c856d2f9009c4b10f395ab389ac84591..06aee757179ca82c525c8c9c3f49368603351a5e 100644 (file)
--- a/vg_io.h
+++ b/vg_io.h
@@ -3,35 +3,130 @@
 #ifndef VG_IO_H
 #define VG_IO_H
 
+#include "vg.h"
 #include "vg_stdint.h"
 #include "vg_platform.h"
 #include "vg_log.h"
 #include "vg_mem.h"
-#include <stdio.h>
-#include <errno.h>
 
 
-#define _TINYDIR_MALLOC(_size) vg_linear_alloc( vg_mem.scratch, _size )
-#define _TINYDIR_FREE(_size) 
+typedef struct vg_dir vg_dir;
+#ifndef _WIN32
+ #include <dirent.h>
+ struct vg_dir{
+   DIR *h;
+   struct dirent *data;
+   u32 index;
+ };
+#else
+ #include <windows.h>
+ #include <fileapi.h>
+ struct vg_dir{
+   HANDLE h;
+   WIN32_FIND_DATA data;
+   u32 index;
+ };
+#endif
+
+enum vg_entry_type{
+   k_vg_entry_type_unknown,
+   k_vg_entry_type_file,
+   k_vg_entry_type_dir
+};
+
+static int vg_dir_open( vg_dir *dir, const char *name ){
+#ifdef _WIN32
+   char q_buf[4096];
+   vg_str q;
+   vg_strnull( &q, q_buf, 4096 );
+   vg_strcat( &q, name );
+   vg_strcat( &q, "/*" );
+   if( !vg_strgood(&q) ) return 0;
+
+   vg_info( "FindFirstFile( '%s' )\n", q.buffer );
+   dir->h = FindFirstFile( q.buffer, &dir->data );
+   if( dir->h == INVALID_HANDLE_VALUE ){
+      if( GetLastError() == ERROR_FILE_NOT_FOUND ){
+         dir->index = 0;
+         return 1;
+      }
+      else return 0;
+   }
+#else
+   dir->h = opendir( name );
+   if( !dir->h ) return 0;
+#endif
+   dir->index = 1;
+   return 1;
+}
 
-#include "submodules/tinydir/tinydir.h"
-#include <sys/stat.h>
+static const char *vg_dir_entry_name( vg_dir *dir ){
+#ifdef _WIN32
+   return dir->data.cFileName;
+#else
+   return dir->data->d_name;
+#endif
+}
 
-/* 
- * Create directory and silently ignore errors for already exists
- */
-VG_STATIC int vg_mkdir( const char *path )
-{
-   if( mkdir( path, S_IRWXU|S_IRWXG|S_IWOTH|S_IXOTH ) ){
-      if( errno == EEXIST )
-         return 1;
+static int vg_dirskip( vg_dir *dir ){
+   const char *s = vg_dir_entry_name(dir);
+#ifdef _WIN32
+   if( dir->data.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN ) return 1;
+#endif
+   if( s[0] == '.' ){
+      if( s[1] == '\0' ) return 1;
+      else if( s[1] == '.' ){
+         if( s[2] == '\0' ) return 1;
+      }
+   }
+   return 0;
+}
 
-      vg_error( "Failed to create directory: %s\n", path );
-      return 0;
+static int vg_dir_next_entry( vg_dir *dir ){
+#ifdef _WIN32
+   if( dir->index == 0 ) return 0;
+   if( dir->index > 1 ) {
+      dir->index ++;
+      if( !FindNextFile( dir->h, &dir->data ) ) return 0;
    }
-   else{
-      return 1;
+   while( vg_dirskip(dir) ){
+      dir->index ++;
+      if( !FindNextFile( dir->h, &dir->data ) ) return 0;
+   }
+   if( dir->index == 1 ) dir->index ++;
+   return 1;
+#else
+   while( (dir->data = readdir(dir->h)) ){
+      dir->index ++;
+      if( !vg_dirskip(dir) ) break;
    }
+   if( dir->data ) return 1;
+   else return 0;
+#endif
+}
+
+static enum vg_entry_type vg_dir_entry_type( vg_dir *dir ){
+#ifdef _WIN32
+   if( dir->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) 
+      return k_vg_entry_type_dir;
+   return k_vg_entry_type_file; /* sketchy? */
+#else
+   if( dir->data->d_type == DT_DIR ) return k_vg_entry_type_dir;
+   if( dir->data->d_type == DT_REG ) return k_vg_entry_type_file;
+#endif
+   return 0;
+}
+
+static void vg_dir_close( vg_dir *dir ){
+#ifdef _WIN32
+   if( dir->index ) FindClose( dir->h );
+   dir->h = INVALID_HANDLE_VALUE;
+#else
+   closedir( dir->h );
+   dir->h = NULL;
+   dir->data = NULL;
+#endif
+   dir->index = 0;
 }
 
 /*