Move some internal message stuff to src/

[vlc] / src / vlc.c

diff --git a/src/vlc.c b/src/vlc.c
index b7a340aad70b9149648c34b8601153f82b2f86cd..208fd86b5dcc7c3ba12d3a12e8f5bc4c0456f1cd 100644 (file)
--- a/src/vlc.c
+++ b/src/vlc.c
@@ -35,9 +35,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <locale.h>
-#ifdef __GLIBC__
-#include <dlfcn.h>
-#endif
 
 
 /* Explicit HACK */
@@ -52,14 +49,12 @@ extern char *FromLocale (const char *);
 #include <windows.h>
 extern void __wgetmainargs(int *argc, wchar_t ***wargv, wchar_t ***wenviron,
                            int expand_wildcards, int *startupinfo);
-static inline void Kill(void) { }
 #else
 
 # include <signal.h>
 # include <time.h>
 # include <pthread.h>
 
-static void Kill (void);
 static void *SigHandler (void *set);
 #endif
 
@@ -68,22 +63,8 @@ static void *SigHandler (void *set);
  *****************************************************************************/
 int main( int i_argc, const char *ppsz_argv[] )
 {
-    int i_ret;
+    int i_ret, id;
 
-#   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__
@@ -92,9 +73,12 @@ int main( int i_argc, const char *ppsz_argv[] )
 #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" );
@@ -106,11 +90,9 @@ int main( int i_argc, const char *ppsz_argv[] )
 #endif
 
     /* Create a libvlc structure */
-    i_ret = VLC_Create();
-    if( i_ret < 0 )
-    {
-        return -i_ret;
-    }
+    id = VLC_Create();
+    if( id < 0 )
+        return 1;
 
 #if !defined(WIN32) && !defined(UNDER_CE)
     /* Synchronously intercepted POSIX signals.
@@ -205,20 +187,18 @@ int main( int i_argc, const char *ppsz_argv[] )
     }
 
     /* Initialize libvlc */
-    i_ret = VLC_Init( 0, i_argc, ppsz_argv );
+    i_ret = VLC_Init( id, i_argc, ppsz_argv );
     if( i_ret < 0 )
     {
         VLC_Destroy( 0 );
         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 );
 
-    Kill ();
-
     /* Destroy the libvlc structure */
     VLC_Destroy( 0 );
 
@@ -274,42 +254,35 @@ static void *SigHandler (void *data)
          * 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);
-
-            /* Acknowledge the signal received */
-            Kill ();
+                            "again quickly in case it gets stuck\n", i_signal);
+            VLC_Die( 0 );
         }
-        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);
     }
     /* Never reached */
 }
-
-
-static void KillOnce (void)
-{
-    VLC_Die (0);
-}
-
-static void Kill (void)
-{
-    static pthread_once_t once = PTHREAD_ONCE_INIT;
-    pthread_once (&once, KillOnce);
-}
-
 #endif
 
 #if defined(UNDER_CE)