X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvlc.c;h=11a7c632d29826d61d3e58cc65f3d640edefa93b;hb=e65e71975462203720ed5620a10c97037f90076a;hp=8bcc0d7e8682fb4c495d7a3cb6e5f8c71d80785e;hpb=0f6073f944f95e4434718b2647d04faf3f14d360;p=vlc

diff --git a/src/vlc.c b/src/vlc.c
index 8bcc0d7e86..11a7c632d2 100644
--- a/src/vlc.c
+++ b/src/vlc.c
@@ -28,9 +28,13 @@
 #include "config.h"
 
 #include <vlc/vlc.h>
-#include <stdio.h>                                              /* fprintf() */
-#include <stdlib.h>                                  /* putenv(), strtol(),  */
+#include <stdio.h>
+#include <stdlib.h>
 #include <locale.h>
+#ifdef __GLIBC__
+#include <dlfcn.h>
+#endif
+
 
 /* Explicit HACK */
 extern void LocaleFree (const char *);
@@ -58,10 +62,24 @@ static void *SigHandler (void *set);
 /*****************************************************************************
  * main: parse command line, start interface and spawn threads.
  *****************************************************************************/
-int main( int i_argc, char *ppsz_argv[] )
+int main( int i_argc, const char *ppsz_argv[] )
 {
     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__
@@ -77,12 +95,6 @@ int main( int i_argc, char *ppsz_argv[] )
     /* Disable the ugly Gnome crash dialog so that we properly segfault */
     putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
 #   endif
-
-    /* If the user isn't using VLC_VERBOSE, set it to 0 by default */
-    if( getenv( "VLC_VERBOSE" ) == NULL )
-    {
-        putenv( (char *)"VLC_VERBOSE=0" );
-    }
 #endif
 
 #if defined (HAVE_GETEUID) && !defined (SYS_BEOS)
@@ -97,11 +109,30 @@ int main( int i_argc, char *ppsz_argv[] )
     }
 
 #if !defined(WIN32) && !defined(UNDER_CE)
-    /* Synchronously intercepted signals. Thy request a clean shutdown,
-     * and force an unclean shutdown if they are triggered again 2+ seconds
-     * later. We have to handle SIGTERM cleanly because of daemon mode.
+    /* Synchronously intercepted POSIX signals.
+     *
+     * In a threaded program such as VLC, the only sane way to handle signals
+     * is to block them in all thread but one - this is the only way to
+     * predict which thread will receive them. If any piece of code depends
+     * on delivery of one of this signal it is intrinsically not thread-safe
+     * and MUST NOT be used in VLC, whether we like it or not.
+     * There is only one exception: if the signal is raised with
+     * pthread_kill() - we do not use this in LibVLC but some pthread
+     * implementations use them internally. You should really use conditions
+     * for thread synchronization anyway.
+     *
+     * Signal that request a clean shutdown, and force an unclean shutdown
+     * if they are triggered again 2+ seconds later.
+     * We have to handle SIGTERM cleanly because of daemon mode.
      * Note that we set the signals after the vlc_create call. */
     static const int exitsigs[] = { SIGINT, SIGHUP, SIGQUIT, SIGTERM };
+    /* Signals that cause a no-op:
+     * - SIGALRM should not happen, but lets stay on the safe side.
+     * - SIGPIPE might happen with sockets and would crash VLC. It MUST be
+     *   blocked by any LibVLC-dependant application, in addition to VLC.
+     * - SIGCHLD is comes after exec*() (such as httpd CGI support) and must
+     *   be dequeued to cleanup zombie processes.
+     */
     static const int dummysigs[] = { SIGALRM, SIGPIPE, SIGCHLD };
 
     sigset_t set;
@@ -131,7 +162,7 @@ int main( int i_argc, char *ppsz_argv[] )
         int si = { 0 };
         __wgetmainargs(&i_wargc, &wargv, &wenvp, 0, &si);
 
-        for( i = 1; i < i_wargc; i++ )
+        for( i = 0; i < i_wargc; i++ )
         {
             int len = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, NULL, 0, NULL, NULL);
             if( len > 0 )
@@ -213,13 +244,17 @@ int main( int i_argc, char *ppsz_argv[] )
  *****************************************************************************/
 static void *SigHandler (void *data)
 {
-    const sigset_t *set = (sigset_t *)data;
+    const sigset_t *exitset = (sigset_t *)data;
+    sigset_t fullset;
     time_t abort_time = 0;
 
+    pthread_sigmask (SIG_BLOCK, exitset, &fullset);
+
     for (;;)
     {
         int i_signal, state;
-        (void)sigwait (set, &i_signal);
+        if( sigwait (&fullset, &i_signal) != 0 )
+            continue;
 
 #ifdef __APPLE__
         /* In Mac OS X up to 10.4.8 sigwait (among others) is not a pthread
@@ -227,6 +262,9 @@ static void *SigHandler (void *data)
         pthread_testcancel();
 #endif
 
+        if (!sigismember (exitset, i_signal))
+            continue; /* Ignore "dummy" signals */
+
         /* Once a signal has been trapped, the termination sequence will be
          * armed and subsequent signals will be ignored to avoid sending
          * signals to a libvlc structure having been destroyed */
@@ -245,9 +283,9 @@ static void *SigHandler (void *data)
         }
         else
         if (time (NULL) <= abort_time)
-	{
+        {
             /* If user asks again more than 2 seconds later, die badly */
-            pthread_sigmask (SIG_UNBLOCK, set, NULL);
+            pthread_sigmask (SIG_UNBLOCK, exitset, NULL);
             fprintf (stderr, "user insisted too much, dying badly\n");
             abort ();
         }
@@ -259,7 +297,7 @@ static void *SigHandler (void *data)
 
 static void KillOnce (void)
 {
-	VLC_Die (0);
+    VLC_Die (0);
 }
 
 static void Kill (void)