#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <stdio.h>
#include <stdlib.h>
#include <locale.h>
+#ifdef __GLIBC__
+#include <dlfcn.h>
+#endif
/* Explicit HACK */
{
int i_ret;
+# ifdef __GLIBC__
+ if (dlsym (RTLD_NEXT, "inet6_rth_add") && !dlsym (RTLD_NEXT, "qsort_r"))
+ {
+ /* Way too many Linux users have glibc 2.5-2.7 that keeps crashing
+ * inside its non-thread-safe dcgettext(). */
+ /* Hopefully glibc 2.8 will eventually work, not sure though */
+ fprintf (stderr,
+"***************************************************\n"
+"*** glibc version with broken libintl detected. ***\n"
+"*** Messages localization will be disabled. ***\n"
+"***************************************************\n");
+ setenv ("LC_MESSAGES", "C", 1);
+ }
+# endif
setlocale (LC_ALL, "");
#ifndef __APPLE__
#endif
#ifdef HAVE_PUTENV
-# ifdef DEBUG
+# ifndef NDEBUG
/* Activate malloc checking routines to detect heap corruptions. */
putenv( (char*)"MALLOC_CHECK_=2" );
+# ifdef __APPLE__
+ putenv( (char*)"MallocErrorAbort=crash_my_baby_crash" );
+# endif
/* Disable the ugly Gnome crash dialog so that we properly segfault */
putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
return i_ret == VLC_EEXITSUCCESS ? 0 : -i_ret;
}
- i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE, VLC_TRUE );
+ i_ret = VLC_AddIntf( 0, NULL, true, true );
/* Finish the threads */
VLC_CleanUp( 0 );
* signals to a libvlc structure having been destroyed */
pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state);
- if (abort_time == 0)
+ if (abort_time == 0 || time (NULL) > abort_time)
{
time (&abort_time);
abort_time += 2;
fprintf (stderr, "signal %d received, terminating vlc - do it "
- "again in case it gets stuck\n", i_signal);
+ "again quickly in case it gets stuck\n", i_signal);
/* Acknowledge the signal received */
Kill ();
}
- else
- if (time (NULL) <= abort_time)
+ else /* time (NULL) <= abort_time */
{
/* If user asks again more than 2 seconds later, die badly */
pthread_sigmask (SIG_UNBLOCK, exitset, NULL);
fprintf (stderr, "user insisted too much, dying badly\n");
+#ifdef __APPLE__
+ /* On Mac OS X, use exit(-1) as it doesn't trigger
+ * backtrace generation, whereas abort() does.
+ * The backtrace generation trigger a Crash Dialog
+ * And takes way too much time, which is not what
+ * we want. */
+ exit (-1);
+#else
abort ();
+#endif
}
pthread_setcancelstate (state, NULL);
}