Streamlined file, file_id and io related related functions.

aq-org · Aug 1, 2024 · 905170e · 905170e
1 parent 494686f
commit 905170e
Show file tree

Hide file tree

Showing 7 changed files with 214 additions and 341 deletions.
diff --git a/aqvm/base/file/file.c b/aqvm/base/file/file.c
@@ -39,7 +39,7 @@ int AqvmBaseFile_UnlockFile(struct AqvmBaseFile_File* file) {
 }
 
 void AqvmBaseFile_clearerr(struct AqvmBaseFile_File* stream) {
-  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream)) {
+  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream) != 0) {
     // TODO
     return;
   }
@@ -48,7 +48,7 @@ void AqvmBaseFile_clearerr(struct AqvmBaseFile_File* stream) {
 }
 
 int AqvmBaseFile_fclose(struct AqvmBaseFile_File* stream) {
-  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream)) {
+  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream) != 0) {
     // TODO
     return -1;
   }
@@ -70,7 +70,7 @@ int AqvmBaseFile_fclose(struct AqvmBaseFile_File* stream) {
 }
 
 int AqvmBaseFile_feof(struct AqvmBaseFile_File* stream) {
-  if (stream == NULL || AqvmBaseFile_ferror(stream)) {
+  if (stream == NULL || AqvmBaseFile_ferror(stream) != 0) {
     // TODO
     return -1;
   }
@@ -90,7 +90,7 @@ int AqvmBaseFile_ferror(struct AqvmBaseFile_File* stream) {
 }
 
 int AqvmBaseFile_fflush(struct AqvmBaseFile_File* stream) {
-  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream)) {
+  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream) != 0) {
     // TODO
     return -1;
   }
@@ -116,7 +116,7 @@ int AqvmBaseFile_fflush(struct AqvmBaseFile_File* stream) {
 }
 
 int AqvmBaseFile_fgetpos(struct AqvmBaseFile_File* stream, fpos_t* pos) {
-  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream) ||
+  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream) != 0 ||
       pos == NULL) {
     // TODO
     return -1;
@@ -156,7 +156,7 @@ struct AqvmBaseFile_File* AqvmBaseFile_fopen(const char* filename,
   }
 
   stream->file = fopen(filename, mode);
-  if (stream->file == NULL || AqvmBaseFile_ferror(stream)) {
+  if (stream->file == NULL || AqvmBaseFile_ferror(stream) != 0) {
     free(stream);
     // TODO
     return NULL;
@@ -174,7 +174,7 @@ struct AqvmBaseFile_File* AqvmBaseFile_fopen(const char* filename,
 size_t AqvmBaseFile_fread(void* ptr, size_t size, size_t nmemb,
                           struct AqvmBaseFile_File* stream) {
   if (ptr == NULL || stream == NULL || stream->file == NULL ||
-      AqvmBaseFile_ferror(stream)) {
+      AqvmBaseFile_ferror(stream) != 0) {
     // TODO
     return 0;
   }
@@ -197,7 +197,7 @@ size_t AqvmBaseFile_fread(void* ptr, size_t size, size_t nmemb,
 struct AqvmBaseFile_File* AqvmBaseFile_freopen(
     const char* filename, const char* mode, struct AqvmBaseFile_File* stream) {
   if (filename == NULL || mode == NULL || stream == NULL ||
-      stream->file == NULL || AqvmBaseFile_ferror(stream)) {
+      stream->file == NULL || AqvmBaseFile_ferror(stream) != 0) {
     // TODO
     return NULL;
   }
@@ -229,7 +229,7 @@ struct AqvmBaseFile_File* AqvmBaseFile_freopen(
 
 int AqvmBaseFile_fseek(struct AqvmBaseFile_File* stream, long int offset,
                        int whence) {
-  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream)) {
+  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream) != 0) {
     // TODO
     return -1;
   }
@@ -255,7 +255,7 @@ int AqvmBaseFile_fseek(struct AqvmBaseFile_File* stream, long int offset,
 }
 
 int AqvmBaseFile_fsetpos(struct AqvmBaseFile_File* stream, const fpos_t* pos) {
-  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream) ||
+  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream) != 0 ||
       pos == NULL) {
     // TODO
     return -1;
@@ -282,7 +282,7 @@ int AqvmBaseFile_fsetpos(struct AqvmBaseFile_File* stream, const fpos_t* pos) {
 }
 
 long int AqvmBaseFile_ftell(struct AqvmBaseFile_File* stream) {
-  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream)) {
+  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream) != 0) {
     // TODO
     return -1L;
   }
@@ -310,7 +310,7 @@ long int AqvmBaseFile_ftell(struct AqvmBaseFile_File* stream) {
 size_t AqvmBaseFile_fwrite(const void* ptr, size_t size, size_t nmemb,
                            struct AqvmBaseFile_File* stream) {
   if (ptr == NULL || stream == NULL || stream->file == NULL ||
-      AqvmBaseFile_ferror(stream)) {
+      AqvmBaseFile_ferror(stream) != 0) {
     // TODO
     return 0;
   }
@@ -359,7 +359,7 @@ int AqvmBaseFile_rename(const char* old_filename, const char* new_filename) {
 }
 
 void AqvmBaseFile_rewind(struct AqvmBaseFile_File* stream) {
-  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream)) {
+  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream) != 0) {
     // TODO
     return;
   }
@@ -377,7 +377,7 @@ void AqvmBaseFile_rewind(struct AqvmBaseFile_File* stream) {
 }
 
 void AqvmBaseFile_setbuf(struct AqvmBaseFile_File* stream, char* buffer) {
-  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream)) {
+  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream) != 0) {
     // TODO
     return;
   }
@@ -396,7 +396,7 @@ void AqvmBaseFile_setbuf(struct AqvmBaseFile_File* stream, char* buffer) {
 
 int AqvmBaseFile_setvbuf(struct AqvmBaseFile_File* stream, char* buffer,
                          int mode, size_t size) {
-  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream)) {
+  if (stream == NULL || stream->file == NULL || AqvmBaseFile_ferror(stream) != 0) {
     // TODO
     return -1;
   }
@@ -430,7 +430,7 @@ struct AqvmBaseFile_File* AqvmBaseFile_tmpfile(void) {
   }
 
   stream->file = tmpfile();
-  if (stream->file == NULL || AqvmBaseFile_ferror(stream)) {
+  if (stream->file == NULL || AqvmBaseFile_ferror(stream) != 0) {
     free(stream);
     // TODO
     return NULL;

diff --git a/aqvm/base/file/file_id/file_id.c b/aqvm/base/file/file_id/file_id.c
@@ -27,7 +27,7 @@ int AqvmBaseFileFileId_GetFileId(const char* filename,
     return -2;
   }
 #elif _WIN32
-  if (AqvmBaseFileFileIdUnix_GetFileId(filename, file_id) != 0) {
+  if (AqvmBaseFileFileIdWindows_GetFileId(filename, file_id) != 0) {
     // TODO
     return -3;
   }
@@ -48,7 +48,7 @@ uint32_t AqvmBaseFileFileId_GetFileIdHash(AqvmBaseFileFileId_FileId* file_id) {
 #ifdef __unix__
   return AqvmBaseFileFileIdUnix_GetFileIdHash(file_id);
 #elif _WIN32
-  return AqvmBaseFileFileIdUnix_GetFileIdHash(file_id);
+  return AqvmBaseFileFileIdWindows_GetFileIdHash(file_id);
 #else
   // TODO
   return 0;

diff --git a/aqvm/base/file/file_id/windows/file_id.c b/aqvm/base/file/file_id/windows/file_id.c
@@ -7,6 +7,8 @@
 
 #include <windows.h>
 
+#include "aqvm/base/hash/hash.h"
+
 int AqvmBaseFileFileIdWindows_GetFileId(
     const char* filename, AqvmBaseFileFileIdWindows_FileId* file_id) {
   if (filename == NULL || file_id == NULL) {
@@ -23,9 +25,9 @@ int AqvmBaseFileFileIdWindows_GetFileId(
 
   BY_HANDLE_FILE_INFORMATION file_info;
   if (GetFileInformationByHandle(handle_file, &file_info)) {
-    file_id.dwVolumeSerialNumber = file_info.dwVolumeSerialNumber;
-    file_id.nFileIndexHigh = file_info.nFileIndexHigh;
-    file_id.nFileIndexLow = file_info.nFileIndexLow;
+    file_id->dwVolumeSerialNumber = file_info.dwVolumeSerialNumber;
+    file_id->nFileIndexHigh = file_info.nFileIndexHigh;
+    file_id->nFileIndexLow = file_info.nFileIndexLow;
   } else {
     // TODO
     return -3;

diff --git a/aqvm/base/file/windows/file.h b/aqvm/base/file/windows/file.h
@@ -13,5 +13,7 @@
 
 HANDLE AqvmBaseFileWindows_FileToHandle(struct AqvmBaseFile_File* file);
 
+// fopen freopen setbuf tmpfile tmpnam vsprintf 
+
 #endif
 #endif