Changeset 4817Tweet

Timestamp:

06/13/12 13:32:42 (12 months ago)

Author:

sam

Message:

win32: use sprintf_s and vsnprintf_s on Windows, so that our static library
works with the VS2010 runtime, too. Also reduce the stack size requirements
to avoid depending on chkstk_ms().

Location:

libcaca/trunk

Files:

• caca/figfont.c (modified) (3 diffs)
• caca/string.c (modified) (1 diff)
• configure.ac (modified) (1 diff)
• win32/config.h (modified) (2 diffs)

libcaca/trunk/caca/figfont.c

@@ -298 +298 @@
 static caca_charfont_t * open_charfont(char const *path)
 {
-#if !defined __KERNEL__ && defined HAVE_SNPRINTF
-    char altpath[2048];
-#endif
     char buf[2048];
     char hardblank[10];
@@ -306 +303 @@
     char *data = NULL;
     caca_file_t *f;
+#if !defined __KERNEL__ && (defined HAVE_SNPRINTF || defined HAVE_SPRINTF_S)
+    int const pathlen = 2048;
+    char *altpath = NULL;
+#endif
     int i, j, size, comment_lines;
 
@@ -317 +318 @@
     /* Open font: if not found, try .tlf, then .flf */
     f = caca_file_open(path, "r");
-#if !defined __KERNEL__ && defined HAVE_SNPRINTF
-
-#if (! defined(snprintf)) && ( defined(_WIN32) || defined(WIN32) ) && (! defined(__CYGWIN__))
-#define snprintf _snprintf
+#if !defined __KERNEL__ && (defined HAVE_SNPRINTF || defined HAVE_SPRINTF_S)
+    if(!f)
+        altpath = malloc(pathlen);
+    if(!f)
+    {
+#if defined HAVE_SPRINTF_S
+        sprintf_s(altpath, pathlen - 1, "%s.tlf", path);
+#else
+        snprintf(altpath, pathlen - 1, "%s.tlf", path);
 #endif
-
+        altpath[pathlen - 1] = '\0';
+        f = caca_file_open(altpath, "r");
+    }
     if(!f)
     {
-        snprintf(altpath, 2047, "%s.tlf", path);
-        altpath[2047] = '\0';
+#if defined HAVE_SPRINTF_S
+        sprintf_s(altpath, pathlen - 1, "%s.flf", path);
+#else
+        snprintf(altpath, pathlen - 1, "%s.flf", path);
+#endif
+        altpath[pathlen - 1] = '\0';
         f = caca_file_open(altpath, "r");
     }
-    if(!f)
-    {
-        snprintf(altpath, 2047, "%s.flf", path);
-        altpath[2047] = '\0';
-        f = caca_file_open(altpath, "r");
-    }
+    if (altpath)
+        free(altpath);
 #endif
     if(!f)

libcaca/trunk/caca/string.c

@@ -337 +337 @@
         buf = malloc(cv->width - x + 1);
 
-#if defined(HAVE_VSNPRINTF)
+#if defined(HAVE_VSNPRINTF_S)
+    vsnprintf_s(buf, cv->width - x + 1, _TRUNCATE, format, args);
+#elif defined(HAVE_VSNPRINTF)
     vsnprintf(buf, cv->width - x + 1, format, args);
 #else

libcaca/trunk/configure.ac

@@ -121 +121 @@
 
 AC_CHECK_HEADERS(stdio.h stdarg.h signal.h sys/ioctl.h sys/time.h endian.h unistd.h arpa/inet.h netinet/in.h winsock2.h errno.h locale.h getopt.h dlfcn.h termios.h)
-AC_CHECK_FUNCS(signal ioctl snprintf vsnprintf getenv putenv strcasecmp htons)
+AC_CHECK_FUNCS(signal ioctl snprintf sprintf_s vsnprintf vsnprintf_s getenv putenv strcasecmp htons)
 AC_CHECK_FUNCS(usleep gettimeofday atexit)
 

libcaca/trunk/win32/config.h

@@ -44 +44 @@
 /* #undef HAVE_SLSMG_UTF8_ENABLE */
 #define HAVE_SNPRINTF 1
+#define HAVE_SPRINTF_S 1
 #define HAVE_STDARG_H 1
 #define HAVE_STDIO_H 1
@@ -60 +61 @@
 /* #undef HAVE_USLEEP */
 /* #undef HAVE_VSNPRINTF */
+#define HAVE_VSNPRINTF_S 1
 #define HAVE_WINDOWS_H 1
 #define HAVE_WINSOCK2_H 1