X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=fs.c;h=7844703e62a818bd9f7d1ebaa85464b4e4d95315;hp=eb1a57209d97bbd05b4c90bc75338ca2ae670f9f;hb=151606e25558ec8f8f211db5aba4c4fa66948731;hpb=09a1a375546b8ecd946aa8a1055f1583ac316a51 diff --git a/fs.c b/fs.c index eb1a572..7844703 100644 --- a/fs.c +++ b/fs.c @@ -33,15 +33,16 @@ * 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). + * at least I think so). */ #ifdef _MSC_VER +#include /* _CrtSetReportMode, _CRT_ASSERT */ /* {{{ */ /* * 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. + * We handle them here, for all file-operations. */ static void file_exception ( @@ -53,7 +54,7 @@ ) { wprintf(L"Invalid parameter dectected %s:%d %s [%s]\n", file, line, function, expression); wprintf(L"Aborting ...\n"); - abort(); + exit(EXIT_FAILURE); } static void file_init() { @@ -128,7 +129,7 @@ /* * These are implemented as just generic wrappers to keep consistency in - * the API. Not as macros though + * the API. Not as macros though */ void fs_file_close(FILE *fp) { /* Invokes file_exception on windows if fp is null */ @@ -165,16 +166,6 @@ int fs_file_seek(FILE *fp, long int off, int whence) { return fseek(fp, off, whence); } -int fs_file_putc(FILE *fp, int ch) { - /* Invokes file_exception on windows if fp is null */ - return fputc(ch, fp); -} - -int fs_file_flush(FILE *fp) { - /* Invokes file_exception on windows if fp is null */ - return fflush(fp); -} - long int fs_file_tell(FILE *fp) { /* Invokes file_exception on windows if fp is null */ return ftell(fp); @@ -231,17 +222,17 @@ int fs_file_getline(char **lineptr, size_t *n, FILE *stream) { /* * Now we implement some directory functionality. Windows lacks dirent.h * this is such a pisss off, we implement it here. - */ -#if defined(_WIN32) + */ +#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; - strcpy(dir->dd_name, name); + platform_strncpy(dir->dd_name, name, strlen(name)); return dir; } - + int fs_dir_close(DIR *dir) { FindClose((HANDLE)dir->dd_handle); mem_d ((void*)dir); @@ -258,8 +249,8 @@ int fs_file_getline(char **lineptr, size_t *n, FILE *stream) { if (*dir->dd_name) { size_t n = strlen(dir->dd_name); if ((dirname = (char*)mem_a(n + 5) /* 4 + 1 */)) { - strcpy(dirname, dir->dd_name); - strcpy(dirname + n, "\\*.*"); /* 4 + 1 */ + platform_strncpy(dirname, dir->dd_name, n); + platform_strncpy(dirname + n, "\\*.*", 4); /* 4 + 1 */ } } else { if (!(dirname = util_strdup("\\*.*"))) @@ -277,9 +268,9 @@ int fs_file_getline(char **lineptr, size_t *n, FILE *stream) { if (!rets) return NULL; - + if ((data = (struct dirent*)mem_a(sizeof(struct dirent)))) { - strncpy(data->d_name, info.cFileName, FILENAME_MAX - 1); + platform_strncpy(data->d_name, info.cFileName, FILENAME_MAX - 1); data->d_name[FILENAME_MAX - 1] = '\0'; /* terminate */ data->d_namlen = strlen(data->d_name); } @@ -293,34 +284,29 @@ int fs_file_getline(char **lineptr, size_t *n, FILE *stream) { 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 - #include /* mkdir */ - #include /* chdir */ +# if !defined(__MINGW32__) +# include /* mkdir */ - DIR *fs_dir_open(const char *name) { - return opendir(name); - } + 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_close(DIR *dir) { - return closedir(dir); - } +DIR *fs_dir_open(const char *name) { + return opendir(name); +} - struct dirent *fs_dir_read(DIR *dir) { - return readdir(dir); - } +int fs_dir_close(DIR *dir) { + return closedir(dir); +} - int fs_dir_change(const char *path) { - return chdir(path); - } +struct dirent *fs_dir_read(DIR *dir) { + return readdir(dir); +} - int fs_dir_make(const char *path) { - return mkdir(path, 0700); - } -#endif /*! defined (_WIN32) */ +#endif /*! defined(_WIN32) && !defined(__MINGW32__) */