Implementing filemanager

Implementing and testing filemanager and upgrading epanet_output library to use it.

src/util/filemanager.c

@@ -1,49 +1,91 @@
 
 
-#include <stdio.h>
+
+// MSVC ONLY
+#ifdef _DEBUG
+    #define _CRTDBG_MAP_ALLOC
+    #include <stdlib.h>
+    #include <crtdbg.h>
+#else
+    #include <stdlib.h>
+#endif
+
 #include <string.h>
 
 #include "filemanager.h"
 
 
+typedef struct file_s {
+    char filename[FILE_MAXNAME + 1];
+    FILE *file;
+    char mode[FILE_MAXMODE + 1];
+} file_handle_t;
+
+
 // local (private) functions
+int _fopen(FILE **f, const char *name, const char *mode);
 int _get_temp_filename(char *tempname);
 
 
-file_handle_t *create_file_manager(const char *filename, const char *file_mode) {
+file_handle_t *create_file_manager() {
 
     file_handle_t *file_handle;
     file_handle = (file_handle_t*)calloc(1, sizeof(file_handle_t));
 
+    return file_handle;
+}
+
+void delete_file_manager(file_handle_t *file_handle) {
+    free(file_handle);
+}
+
+
+int open_file(file_handle_t *file_handle, const char *filename, const char *file_mode) {
+    int error = 0;
+
     if (filename == NULL)
         _get_temp_filename(file_handle->filename);
     else
         strncpy(file_handle->filename, filename, FILE_MAXNAME);
 
-    file_handle->file = NULL;
-    strncpy(file_handle->mode, file_mode, FILE_MAXMODE);
-
-    return file_handle;
-}
-
-int delete_file_manager(file_handle_t *file_handle) {
-    free(file_handle);
-}
-
-
-int open_file(file_handle_t *file_handle) {
-    int error = 0;
-
-    if ((file_handle->file = fopen(file_handle->filename, file_handle->mode)) == NULL)
+    if (file_mode == NULL)
         error = -1;
+    else {
+        strncpy(file_handle->mode, file_mode, FILE_MAXMODE);
+        error = _fopen(&(file_handle->file), file_handle->filename, file_handle->mode);
+    }
 
     return error;
 }
 
-FILE *get_file(file_handle_t *file_handle) {
-    return file_handle->file;
+int seek_file(file_handle_t *file_handle, F_OFF offset, int whence)
+{
+#ifdef _WIN32 // Windows (32-bit and 64-bit)
+#define FSEEK64 _fseeki64
+#else         // Other platforms
+#define FSEEK64 fseeko
+#endif
+
+    return FSEEK64(file_handle->file, offset, whence);
 }
 
+F_OFF tell_file(file_handle_t *file_handle)
+{
+#ifdef _WIN32 // Windows (32-bit and 64-bit)
+#define FTELL64 _ftelli64
+#else         // Other platforms
+#define FTELL64 ftello
+#endif
+
+    return FTELL64(file_handle->file);
+}
+
+size_t read_file(void *ptr, size_t size, size_t nmemb, file_handle_t *file_handle)
+{
+    return fread(ptr, size, nmemb, file_handle->file);
+}
+
+
 int close_file(file_handle_t *file_handle) {
     int error = 0;
 
@@ -59,14 +101,30 @@ int remove_file(file_handle_t *file_handle) {
 }
 
 
-int _get_temp_filename(char *tempname) {
-    int error = 0
+int _fopen(FILE **f, const char *name, const char *mode) {
+//
+//  Purpose: Substitute for fopen_s on platforms where it doesn't exist
+//  Note: fopen_s is part of C++11 standard
+//
+    int ret = 0;
 #ifdef _WIN32
-    char* name = NULL;
+    ret = (int)fopen_s(f, name, mode);
+#else
+    *f = fopen(name, mode);
+    if (!*f)
+        ret = -1;
+#endif
+    return ret;
+}
+
+int _get_temp_filename(char *tempname) {
+    int error = 0;
+#ifdef _WIN32
+    char *name = NULL;
 
     // --- use Windows _tempnam function to get a pointer to an
     //     unused file name that begins with "en"
-    if ((name = _tempnam(NULL, "en") == NULL) {
+    if ((name = _tempnam(name, "en")) == NULL) {
         error = -1;
         return error;
     }

src/util/filemanager.h

@@ -8,6 +8,14 @@
 
 #include <stdio.h>
 
+
+// F_OFF Must be a 8 byte / 64 bit integer for large file support
+#ifdef _WIN32 // Windows (32-bit and 64-bit)
+#define F_OFF __int64
+#else         // Other platforms
+#define F_OFF off_t
+#endif
+
 #define FILE_MAXNAME 259
 #define FILE_MAXMODE 3
 
@@ -17,21 +25,22 @@ extern "C" {
 #endif
 
 
-typedef struct file_s {
-    char filename[FILE_MAXNAME + 1],
-    FILE *file;
-    char mode[FILE_MAXMODE + 1];
-} file_handle_t;
+typedef struct file_s file_handle_t;
 
 
-file_handle_t *create_file_manager(const char *filename, const char *file_mode);
+file_handle_t *create_file_manager();
 
-int delete_file_manager(file_handle_t *file_handle);
+void delete_file_manager(file_handle_t *file_handle);
 
 
-int open_file(file_handle_t *file_handle);
+int open_file(file_handle_t *file_handle, const char *filename, const char *file_mode);
+
+int seek_file(file_handle_t *file_handle, F_OFF offset, int whence);
+
+F_OFF tell_file(file_handle_t *file_handle);
+
+size_t read_file(void *ptr, size_t size, size_t nmemb, file_handle_t *file_handle);
 
-FILE *get_file(file_handle_t *file_handle);
 
 int close_file(file_handle_t *file_handle);