X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=ansi.c;h=029508a95ca2e84254412e4a3046a02829910878;hp=a6b2eda77ec42735d1adef8891b0ad1e0059a77e;hb=68c2baa7c1b9ee1ca7804656d6fb5cf65b435a90;hpb=033cf7c7d397c3fdc23a1448b0068000219efef6

diff --git a/ansi.c b/ansi.c
index a6b2eda..029508a 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,25 +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 <unistd.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) {
@@ -53,23 +47,35 @@ 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 < (int)sizeof(buf)) {
+        *dat = util_strdup(buf);
+        return len;
+    }
 
-    va_start(va, format);
-    rt = vsnprintf(src, bytes, format, va);
-    va_end(va);
+    tmp = (char*)mem_a(len + 1);
+    if ((ret = vsnprintf(tmp, len + 1, fmt, args)) != len) {
+        mem_d(tmp);
+        *dat = NULL;
+        return -1;
+    }
 
-    return rt;
+    *dat = tmp;
+    return len;
 }
 
 char *platform_strcat(char *dest, const char *src) {
@@ -129,7 +135,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) {