X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=fs.c;h=beb48192f85d3f36cb3fc64677452a6608e3b21b;hp=e39858a0ed9fd3619abc6c8aca8b51721f42f201;hb=12a864abf5a5cc79f0a8f11535c26bb2009c0ad9;hpb=eb2a74f7e7968f99f6a9e01de838a900ebd6efe0 diff --git a/fs.c b/fs.c index e39858a..beb4819 100644 --- a/fs.c +++ b/fs.c @@ -21,118 +21,28 @@ * SOFTWARE. */ #include "gmqcc.h" +#include "platform.h" -/* - * This is essentially a "wrapper" interface around standard C's IO - * library. There is two reason we implement this, 1) visual studio - * hearts for "secure" varations, as part of it's "Security Enhancements - * in the CRT" (http://msdn.microsoft.com/en-us/library/8ef0s5kh.aspx). - * 2) But one of the greater reasons is for the possibility of large file - * support in the future. I don't expect to reach the 2GB limit any - * time soon (mainly because that would be insane). But when it comes - * to adding support for some other larger IO tasks (in the test-suite, - * or even the QCVM we'll need it). There is also a third possibility of - * building .dat files directly from zip files (which would be very cool - * at least I think so). - */ -#ifdef _MSC_VER -/* {{{ */ - /* - * Visual Studio has security CRT features which I actually want to support - * if we ever port to Windows 8, and want GMQCC to be API safe. - * - * We handle them here, for all file-operations. - */ - - static void file_exception ( - const wchar_t *expression, - const wchar_t *function, - const wchar_t *file, - unsigned int line, - uintptr_t reserved - ) { - wprintf(L"Invalid parameter dectected %s:%d %s [%s]\n", file, line, function, expression); - wprintf(L"Aborting ...\n"); - exit(EXIT_FAILURE); - } - - static void file_init() { - static bool init = false; - - if (init) - return; - - _set_invalid_parameter_handler(&file_exception); - - /* - * Turnoff the message box for CRT asserations otherwise - * we don't get the error reported to the console as we should - * otherwise get. - */ - _CrtSetReportMode(_CRT_ASSERT, 0); - init = !init; - } - - - FILE *fs_file_open(const char *filename, const char *mode) { - FILE *handle = NULL; - file_init(); - - return (fopen_s(&handle, filename, mode) != 0) ? NULL : handle; - } - - size_t fs_file_read(void *buffer, size_t size, size_t count, FILE *fp) { - file_init(); - return fread_s(buffer, size*count, size, count, fp); - } - - int fs_file_printf(FILE *fp, const char *format, ...) { - int rt; - va_list va; - va_start(va, format); - - file_init(); - rt = vfprintf_s(fp, format, va); - va_end (va); - - return rt; - } - -/* }}} */ -#else -/* {{{ */ - /* - * All other compilers/platforms that don't restrict insane policies on - * IO for no aparent reason. - */ - FILE *fs_file_open(const char *filename, const char *mode) { - return fopen(filename, mode); - } - - size_t fs_file_read(void *buffer, size_t size, size_t count, FILE *fp) { - return fread(buffer, size, count, fp); - } +FILE *fs_file_open(const char *filename, const char *mode) { + return platform_fopen(filename, mode); +} - int fs_file_printf(FILE *fp, const char *format, ...) { - int rt; - va_list va; - va_start(va, format); - rt = vfprintf(fp, format, va); - va_end (va); +size_t fs_file_read(void *buffer, size_t size, size_t count, FILE *fp) { + return platform_fread(buffer, size, count, fp); +} - return rt; - } +int fs_file_printf(FILE *fp, const char *format, ...) { + int rt; + va_list va; + va_start(va, format); + rt = platform_vfprintf(fp, format, va); + va_end (va); -/* }}} */ -#endif + return rt; +} -/* - * These are implemented as just generic wrappers to keep consistency in - * the API. Not as macros though - */ void fs_file_close(FILE *fp) { - /* Invokes file_exception on windows if fp is null */ - fclose (fp); + platform_fclose (fp); } size_t fs_file_write ( @@ -141,38 +51,27 @@ size_t fs_file_write ( size_t count, FILE *fp ) { - /* Invokes file_exception on windows if fp is null */ - return fwrite(buffer, size, count, fp); + return platform_fwrite(buffer, size, count, fp); } int fs_file_error(FILE *fp) { - /* Invokes file_exception on windows if fp is null */ - return ferror(fp); + return platform_ferror(fp); } int fs_file_getc(FILE *fp) { - /* Invokes file_exception on windows if fp is null */ - return fgetc(fp); + return platform_fgetc(fp); } int fs_file_puts(FILE *fp, const char *str) { - /* Invokes file_exception on windows if fp is null */ - return fputs(str, fp); + return platform_fputs(str, fp); } int fs_file_seek(FILE *fp, long int off, int whence) { - /* Invokes file_exception on windows if fp is null */ - return fseek(fp, off, whence); -} - -int fs_file_flush(FILE *fp) { - /* Invokes file_exception on windows if fp is null */ - return fflush(fp); + return platform_fseek(fp, off, whence); } long int fs_file_tell(FILE *fp) { - /* Invokes file_exception on windows if fp is null */ - return ftell(fp); + return platform_ftell(fp); } /* @@ -223,101 +122,18 @@ int fs_file_getline(char **lineptr, size_t *n, FILE *stream) { return (ret = pos - *lineptr); } -/* - * Now we implement some directory functionality. Windows lacks dirent.h - * this is such a pisss off, we implement it here. - */ -#if defined(_WIN32) && !defined(__MINGW32__) - DIR *fs_dir_open(const char *name) { - DIR *dir = (DIR*)mem_a(sizeof(DIR) + strlen(name)); - if (!dir) - return NULL; - - strncpy(dir->dd_name, name, strlen(name)); - return dir; - } - - int fs_dir_close(DIR *dir) { - FindClose((HANDLE)dir->dd_handle); - mem_d ((void*)dir); - return 0; - } - - struct dirent *fs_dir_read(DIR *dir) { - WIN32_FIND_DATA info; - struct dirent *data; - int rets; - - if (!dir->dd_handle) { - char *dirname; - if (*dir->dd_name) { - size_t n = strlen(dir->dd_name); - if ((dirname = (char*)mem_a(n + 5) /* 4 + 1 */)) { - strncpy(dirname, dir->dd_name, n); - strncpy(dirname + n, "\\*.*", 4); /* 4 + 1 */ - } - } else { - if (!(dirname = util_strdup("\\*.*"))) - return NULL; - } - - dir->dd_handle = (long)FindFirstFile(dirname, &info); - mem_d(dirname); - rets = !(!dir->dd_handle); - } else if (dir->dd_handle != -11) { - rets = FindNextFile ((HANDLE)dir->dd_handle, &info); - } else { - rets = 0; - } - - if (!rets) - return NULL; - - if ((data = (struct dirent*)mem_a(sizeof(struct dirent)))) { - strncpy(data->d_name, info.cFileName, FILENAME_MAX - 1); - data->d_name[FILENAME_MAX - 1] = '\0'; /* terminate */ - data->d_namlen = strlen(data->d_name); - } - return data; - } - - int fs_dir_change(const char *path) { - return !SetCurrentDirectory(path); - } - - int fs_dir_make(const char *path) { - return !CreateDirectory(path, NULL); - } - - /* - * Visual studio also lacks S_ISDIR for sys/stat.h, so we emulate this as well - * which is not hard at all. - */ -# undef S_ISDIR -# define S_ISDIR(X) ((X)&_S_IFDIR) -#else -# if !defined(__MINGW32__) -# include /* mkdir */ - - int fs_dir_make(const char *path) { - return mkdir(path, 0700); - } -# else - int fs_dir_make(const char *path) { - return mkdir(path); - } -# endif /*! !defined(__MINGW32__) */ +int fs_dir_make(const char *path) { + return platform_mkdir(path, 0700); +} DIR *fs_dir_open(const char *name) { - return opendir(name); + return platform_opendir(name); } int fs_dir_close(DIR *dir) { - return closedir(dir); + return platform_closedir(dir); } struct dirent *fs_dir_read(DIR *dir) { - return readdir(dir); + return platform_readdir(dir); } - -#endif /*! defined(_WIN32) && !defined(__MINGW32__) */