#ifndef LIBVLC_FIXUPS_H
# define LIBVLC_FIXUPS_H 1
+#ifndef HAVE_STRDUP
# include <string.h>
# include <stdlib.h>
-
-#ifndef HAVE_STRDUP
static inline char *strdup (const char *str)
{
size_t len = strlen (str) + 1;
- char *res = malloc (len);
+ char *res = (char *)malloc (len);
if (res) memcpy (res, str, len);
return res;
}
#endif
+#ifdef WIN32
+/* Windows' printf doesn't support %z modifiers, thus we need to rewrite
+ * the format string in a wrapper. */
+# include <string.h>
+# include <stdlib.h>
+static inline char *vlc_fix_format_string (const char *format)
+{
+ char *fmt;
+# ifdef WIN64
+ const char *src = format, *tmp;
+ char *dst;
+ size_t n = 0;
+ while ((tmp = strstr (src, "%z")) != NULL)
+ {
+ n++;
+ src = tmp + 2;
+ }
+ if (n == 0)
+ return NULL;
+
+ fmt = (char*)malloc (strlen (format) + n + 1);
+ if (fmt == NULL)
+ return NULL;
+
+ src = format;
+ dst = fmt;
+ while ((tmp = strstr (src, "%z")) != NULL)
+ {
+ size_t d = tmp - src;
+ memcpy (dst, src, d);
+ dst += d;
+ memcpy (dst, "%ll", 3);
+ dst += 3;
+ src = tmp + 2;
+ }
+ strcpy (dst, src);
+# else
+ char *f;
+ if (strstr (format, "%z") == NULL)
+ return NULL;
+
+ fmt = strdup (format);
+ if (fmt == NULL)
+ return NULL;
+
+ while ((f = strstr (fmt, "%z")) != NULL)
+ {
+ f[1] = 'l';
+ }
+# endif
+ return fmt;
+}
+
+# include <stdio.h>
+# include <stdarg.h>
+
+static inline int vlc_vprintf (const char *format, va_list ap)
+{
+ char *fmt = vlc_fix_format_string (format);
+ int ret = vprintf (fmt ? fmt : format, ap);
+ free (fmt);
+ return ret;
+}
+# define vprintf vlc_vprintf
+
+static inline int vlc_vfprintf (FILE *stream, const char *format, va_list ap)
+{
+ char *fmt = vlc_fix_format_string (format);
+ int ret = vfprintf (stream, fmt ? fmt : format, ap);
+ free (fmt);
+ return ret;
+}
+# define vfprintf vlc_vfprintf
+
+static inline int vlc_vsprintf (char *str, const char *format, va_list ap)
+{
+ char *fmt = vlc_fix_format_string (format);
+ int ret = vsprintf (str, fmt ? fmt : format, ap);
+ free (fmt);
+ return ret;
+}
+# define vsprintf vlc_vsprintf
+
+static inline int vlc_vsnprintf (char *str, size_t size, const char *format, va_list ap)
+{
+ char *fmt = 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 */
+ int ret = _vsnprintf (str, size, fmt ? fmt : format, ap);
+ free (fmt);
+ 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
-# define vasprintf vlc_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
+ int len = vsnprintf (NULL, 0, fmt, ap) + 1;
+ char *res = (char *)malloc (len);
+ if (res == NULL)
+ return -1;
+ *strp = res;
+ return vsnprintf (res, len, fmt, ap);
+#else
+ /* HACK: vsnprintf in the WinCE 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;
+ char *res, *np;
+
+ if ((res = (char *) malloc (size)) == NULL)
+ return -1;
+
+ while (1)
+ {
+ n = vsnprintf (res, size, fmt, ap);
+
+ /* If that worked, return the string. */
+ if (n > -1 && n < size)
+ {
+ *strp = res;
+ return n;
+ }
+
+ /* Else try again with more space. */
+ size *= 2; /* twice the old size */
+
+ if ((np = (char *) realloc (res, size)) == NULL)
+ {
+ free(res);
+ return -1;
+ }
+ else
+ {
+ res = np;
+ }
+
+ }
+#endif /* UNDER_CE */
+}
#endif
#ifndef HAVE_ASPRINTF
-# define asprintf vlc_asprintf
+# include <stdio.h>
+# include <stdarg.h>
+static inline int asprintf (char **strp, const char *fmt, ...)
+{
+ va_list ap;
+ int ret;
+ va_start (ap, fmt);
+ ret = vasprintf (strp, fmt, ap);
+ va_end (ap);
+ return ret;
+}
#endif
#ifndef HAVE_STRNLEN
+# include <string.h>
static inline size_t strnlen (const char *str, size_t max)
{
const char *end = (const char *) memchr (str, 0, max);
#endif
#ifndef HAVE_STRNDUP
+# include <string.h>
+# include <stdlib.h>
static inline char *strndup (const char *str, size_t max)
{
size_t len = strnlen (str, max);
# define strtoll vlc_strtoll
#endif
+#ifndef HAVE_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
# define atoll( str ) (strtoll ((str), (char **)NULL, 10))
#endif
#endif
#ifndef HAVE_GETENV
-static inline getenv (const char *name)
+static inline char *getenv (const char *name)
{
(void)name;
return NULL;
for (size_t i = 0;; i++)
{
int d = tolower (s1[i]) - tolower (s2[i]);
- if (d) return d;
+ if (d || !s1[i]) return d;
}
return 0;
}
for (size_t i = 0; i < n; i++)
{
int d = tolower (s1[i]) - tolower (s2[i]);
- if (d) return d;
+ if (d || !s1[i]) return d;
}
return 0;
}
}
#endif
+/* Alignment of critical static data structures */
+#ifdef ATTRIBUTE_ALIGNED_MAX
+# define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align)))
+#else
+# define ATTR_ALIGN(align)
+#endif
+
#ifndef HAVE_USELOCALE
typedef void *locale_t;
# define newlocale( a, b, c ) ((locale_t)0)
#if defined (ENABLE_NLS)
# include <libintl.h>
-#else
-# define dgettext(dom, str) ((char *)(str))
#endif
#define N_(str) gettext_noop (str)
#define gettext_noop(str) (str)
+#ifdef UNDER_CE
+static inline void rewind ( FILE *stream )
+{
+ fseek(stream, 0L, SEEK_SET);
+ clearerr(stream);
+}
+#endif
+
#endif /* !LIBVLC_FIXUPS_H */
projects / vlc / blobdiff