X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=ansi.c;h=e377424e035014a4560660609138485e1fc5f475;hp=d470e979eebdae521a00abb0974696ff72064059;hb=c33755b0077bc74742c67a03aa2a0a11f10085da;hpb=12a864abf5a5cc79f0a8f11535c26bb2009c0ad9

diff --git a/ansi.c b/ansi.c
index d470e97..e377424 100644
--- a/ansi.c
+++ b/ansi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013
+ * Copyright (C) 2012, 2013, 2014
  *     Dale Weiler
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -20,24 +20,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#define GMQCC_PLATFORM_HEADER
 #include <string.h>
 #include <stdlib.h>
 
 #include "platform.h"
+#include "gmqcc.h"
 
 int platform_vsnprintf(char *buffer, size_t bytes, const char *format, va_list arg) {
     return vsnprintf(buffer, bytes, format, arg);
 }
 
-int platform_sscanf(const char *str, const char *format, ...) {
-    int     rt;
-    va_list va;
-
-    va_start(va, format);
-    rt = vsscanf(str, format, va);
-    va_end (va);
-
-    return rt;
+int platform_vsscanf(const char *str, const char *format, va_list arg) {
+    return vsscanf(str, format, arg);
 }
 
 const struct tm *platform_localtime(const time_t *timer) {
@@ -52,23 +47,38 @@ char *platform_strncat(char *dest, const char *src, size_t num) {
     return strncat(dest, src, num);
 }
 
-const char *platform_tmpnam(char *str) {
-    return tmpnam(str);
-}
-
-const char *platform_getenv(char *var) {
+const char *platform_getenv(const char *var) {
     return getenv(var);
 }
 
-int platform_snprintf(char *src, size_t bytes, const char *format, ...) {
-    int     rt;
-    va_list va;
+int platform_vasprintf(char **dat, const char *fmt, va_list args) {
+    int     ret;
+    int     len;
+    char   *tmp = NULL;
+    char    buf[128];
+    va_list cpy;
+
+    va_copy(cpy, args);
+    len = vsnprintf(buf, sizeof(buf), fmt, cpy);
+    va_end (cpy);
+
+    if (len < 0)
+        return len;
 
-    va_start(va, format);
-    rt = vsnprintf(src, bytes, format, va);
-    va_end(va);
+    if (len < (int)sizeof(buf)) {
+        *dat = util_strdup(buf);
+        return len;
+    }
 
-    return rt;
+    tmp = (char*)mem_a(len + 1);
+    if ((ret = vsnprintf(tmp, len + 1, fmt, args)) != len) {
+        mem_d(tmp);
+        *dat = NULL;
+        return -1;
+    }
+
+    *dat = tmp;
+    return len;
 }
 
 char *platform_strcat(char *dest, const char *src) {
@@ -95,6 +105,10 @@ size_t platform_fwrite(const void *ptr, size_t size, size_t count, FILE *stream)
     return fwrite(ptr, size, count, stream);
 }
 
+int platform_fflush(FILE *stream) {
+    return fflush(stream);
+}
+
 int platform_vfprintf(FILE *stream, const char *format, va_list arg) {
     return vfprintf(stream, format, arg);
 }
@@ -124,7 +138,16 @@ long platform_ftell(FILE *stream) {
 }
 
 int platform_mkdir(const char *path, int mode) {
+    /*
+     * For some reason mingw32 just doesn't have a correct mkdir impl
+     * so we handle that here.
+     */
+#   ifdef _WIN32
+    (void)mode;
+    return mkdir(path);
+#   else
     return mkdir(path, mode);
+#   endif /*!_WIN32*/
 }
 
 DIR *platform_opendir(const char *path) {
@@ -138,3 +161,7 @@ int platform_closedir(DIR *dir) {
 struct dirent *platform_readdir(DIR *dir) {
     return readdir(dir);
 }
+
+int platform_isatty(int fd) {
+    return isatty(fd);
+}