}
#endif
+#ifdef WIN32
+# include <string.h>
+# include <stdlib.h>
+/**
+ * vlc_fix_format_string:
+ * @format: address of format string to fix (format string is not modified)
+ *
+ * Windows' printf doesn't support %z size modifiers.
+ * Fix a *printf format string to make it safe for mingw/MSVCRT run times:
+ * %z* (not supported in MSVCRT) -> either %I64* or %I32.
+ *
+ * Returns: 1 if *format must be free()d; 0 otherwise
+ */
+static inline int vlc_fix_format_string (const char **format)
+{
+ int n = 0;
+ const char *tmp = *format;
+ while ((tmp = strstr (tmp, "%z")) != NULL)
+ {
+ n++;
+ tmp += 2;
+ }
+ if (!n)
+ return 0;
+
+ char *dst = (char*)malloc (strlen (*format) + 2*n + 1);
+ if (!dst)
+ {
+ *format = "vlc_fix_format_string: due to malloc failure, unable to fix unsafe string";
+ return 0;
+ }
+
+ const char *src = *format;
+ *format = dst;
+ while ((tmp = strstr (src, "%z")) != NULL)
+ {
+ /* NB, don't use %l*, as this is buggy in mingw*/
+ size_t d = tmp - src;
+ memcpy (dst, src, d);
+ dst += d;
+ *dst++ = '%';
+# ifdef WIN64
+ *dst++ = 'I';
+ *dst++ = '6';
+ *dst++ = '4';
+# else /* ie: WIN32 */
+ /* on win32, since the default size is 32bit, dont specify
+ * a modifer. (I32 isn't on wince, l doesn't work on mingw) */
+# endif
+ src = tmp + 2;
+ }
+ strcpy (dst, src);
+ return 1;
+}
+
+# include <stdio.h>
+# include <stdarg.h>
+
+static inline int vlc_vprintf (const char *format, va_list ap)
+{
+ int must_free = vlc_fix_format_string (&format);
+ int ret = vprintf (format, ap);
+ if (must_free) free ((char *)format);
+ return ret;
+}
+# define vprintf vlc_vprintf
+
+static inline int vlc_vfprintf (FILE *stream, const char *format, va_list ap)
+{
+ int must_free = vlc_fix_format_string (&format);
+ int ret = vfprintf (stream, format, ap);
+ if (must_free) free ((char *)format);
+ return ret;
+}
+# define vfprintf vlc_vfprintf
+
+static inline int vlc_vsprintf (char *str, const char *format, va_list ap)
+{
+ int must_free = vlc_fix_format_string (&format);
+ int ret = vsprintf (str, format, ap);
+ if (must_free) free ((char *)format);
+ return ret;
+}
+# define vsprintf vlc_vsprintf
+
+static inline int vasprintf (char **strp, const char *fmt, va_list ap);
+static inline int vlc_vsnprintf (char *str, size_t size, const char *format, va_list ap)
+{
+ int must_free = vlc_fix_format_string (&format);
+ /* traditionally, MSVCRT has provided vsnprintf as _vsnprintf;
+ * to 'aid' portability/standards compliance, mingw provides a
+ * static version of vsnprintf that is buggy. Be sure to use
+ * MSVCRT version, at least it behaves as expected */
+ /* MSVCRT _vsnprintf does not:
+ * - null terminate string if insufficient storage
+ * - return the number of characters that would've been written
+ */
+ int ret = _vsnprintf (str, size-1, format, ap);
+ str[size-1] = 0; /* ensure the null gets written */
+ if (ret == -1)
+ {
+ /* work out the number of chars that should've been written */
+ ret = vasprintf (&str, format, ap);
+ if (ret >= 0 && str) free (str);
+ }
+ if (must_free) free ((char *)format);
+ return ret;
+}
+# define vsnprintf vlc_vsnprintf
+
+static inline int vlc_printf (const char *format, ...)
+{
+ va_list ap;
+ int ret;
+ va_start (ap, format);
+ ret = vlc_vprintf (format, ap);
+ va_end (ap);
+ return ret;
+}
+# define printf(...) vlc_printf(__VA_ARGS__)
+
+static inline int vlc_fprintf (FILE *stream, const char *format, ...)
+{
+ va_list ap;
+ int ret;
+ va_start (ap, format);
+ ret = vlc_vfprintf (stream, format, ap);
+ va_end (ap);
+ return ret;
+}
+# define fprintf vlc_fprintf
+
+#if 0
+static inline int vlc_sprintf (char *str, const char *format, ...)
+{
+ va_list ap;
+ int ret;
+ va_start (ap, format);
+ ret = vlc_vsprintf (str, format, ap);
+ va_end (ap);
+ return ret;
+}
+# define sprintf vlc_sprintf
+#endif
+
+static inline int vlc_snprintf (char *str, size_t size, const char *format, ...)
+{
+ va_list ap;
+ int ret;
+ va_start (ap, format);
+ ret = vlc_vsnprintf (str, size, format, ap);
+ va_end (ap);
+ return ret;
+}
+/* win32: snprintf must always be vlc_snprintf or _snprintf,
+ * see comment in vlc_vsnprintf */
+# define snprintf vlc_snprintf
+
+/* Make sure we don't use flawed vasprintf or asprintf either */
+# undef HAVE_VASPRINTF
+# undef HAVE_ASPRINTF
+#endif
+
#ifndef HAVE_VASPRINTF
# include <stdio.h>
# include <stdlib.h>
# include <stdarg.h>
static inline int vasprintf (char **strp, const char *fmt, va_list ap)
{
-#ifndef UNDER_CE
+#ifndef WIN32
int len = vsnprintf (NULL, 0, fmt, ap) + 1;
char *res = (char *)malloc (len);
if (res == NULL)
return -1;
*strp = res;
- return vsprintf (res, fmt, ap);
+ return vsnprintf (res, len, fmt, ap);
#else
- /* HACK: vsnprintf in the WinCE API behaves like
+ /* HACK: vsnprintf in the Win32 API behaves like
* the one in glibc 2.0 and doesn't return the number of characters
* it needed to copy the string.
* cf http://msdn.microsoft.com/en-us/library/1kt27hek.aspx
* and cf the man page of vsnprintf
- *
- Guess we need no more than 50 bytes. */
- int n, size = 50;
+ */
+ int must_free = vlc_fix_format_string (&fmt);
+ int n, size = 2 * strlen (fmt);
char *res, *np;
if ((res = (char *) malloc (size)) == NULL)
+ {
+ if (must_free) free ((char *)fmt);
return -1;
+ }
while (1)
{
- n = vsnprintf (res, size, fmt, ap);
+ n = _vsnprintf (res, size, fmt, ap);
/* If that worked, return the string. */
if (n > -1 && n < size)
{
*strp = res;
+ if (must_free) free ((char *)fmt);
return n;
}
/* Else try again with more space. */
- if (n == -1)
- size *= 2; /* twice the old size */
+ size *= 2; /* twice the old size */
if ((np = (char *) realloc (res, size)) == NULL)
{
free(res);
+ if (must_free) free ((char *)fmt);
return -1;
}
else
}
}
-#endif /* UNDER_CE */
+#endif /* WIN32 */
}
#endif
#endif
#ifndef HAVE_STRSEP
-# define strsep vlc_strsep
+static inline char *strsep( char **ppsz_string, const char *psz_delimiters )
+{
+ char *psz_string = *ppsz_string;
+ if( !psz_string )
+ return NULL;
+
+ char *p = strpbrk( psz_string, psz_delimiters );
+ if( !p )
+ {
+ *ppsz_string = NULL;
+ return psz_string;
+ }
+ *p++ = '\0';
+
+ *ppsz_string = p;
+ return psz_string;
+}
#endif
#ifndef HAVE_ATOLL
projects / vlc / blobdiff