Handle encoding errors for platform_vasprintf

[xonotic/gmqcc.git] / ansi.c

diff --git a/ansi.c b/ansi.c
index 52399df78ca538a156e99eeb03dc087899e3bc74..e377424e035014a4560660609138485e1fc5f475 100644 (file)
--- 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,9 +20,9 @@
  * 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"
@@ -31,15 +31,8 @@ int platform_vsnprintf(char *buffer, size_t bytes, const char *format, va_list a
     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) {
@@ -54,25 +47,10 @@ 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;
-
-    va_start(va, format);
-    rt = vsnprintf(src, bytes, format, va);
-    va_end(va);
-
-    return rt;
-}
-
 int platform_vasprintf(char **dat, const char *fmt, va_list args) {
     int     ret;
     int     len;
@@ -84,6 +62,9 @@ int platform_vasprintf(char **dat, const char *fmt, va_list args) {
     len = vsnprintf(buf, sizeof(buf), fmt, cpy);
     va_end (cpy);
 
+    if (len < 0)
+        return len;
+
     if (len < (int)sizeof(buf)) {
         *dat = util_strdup(buf);
         return len;
@@ -157,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) {