VLC: remove false positives after fork()

[vlc] / bin / vlc.c

diff --git a/bin/vlc.c b/bin/vlc.c
index bad420bacc584dc13f96d830ebe3b3081ff0fbb5..9e769b018cb80fc42eeac674d146dcbc78271658 100644 (file)
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -42,21 +42,38 @@
 /* Explicit HACK */
 extern void LocaleFree (const char *);
 extern char *FromLocale (const char *);
+extern void vlc_enable_override (void);
 
 #include <signal.h>
 #include <time.h>
 #include <pthread.h>
 #include <unistd.h>
+#include <dlfcn.h>
 
 /*****************************************************************************
  * main: parse command line, start interface and spawn threads.
  *****************************************************************************/
 int main( int i_argc, const char *ppsz_argv[] )
 {
-#ifdef __APPLE__
-    /* The so-called POSIX-compliant MacOS X is not. 
-     * SIGPIPE fires even when it is blocked in all threads! */
+    /* The so-called POSIX-compliant MacOS X reportedly processes SIGPIPE even
+     * if it is blocked in all thread. Also some libraries want SIGPIPE blocked
+     * as they have no clue about signal masks.
+     * Note: this is NOT an excuse for not protecting against SIGPIPE. If
+     * LibVLC runs outside of VLC, we cannot rely on this code snippet. */
     signal (SIGPIPE, SIG_IGN);
+
+#ifdef HAVE_PUTENV
+# ifndef NDEBUG
+    /* Activate malloc checking routines to detect heap corruptions. */
+    putenv( (char*)"MALLOC_CHECK_=2" );
+
+    /* Disable the ugly Gnome crash dialog so that we properly segfault */
+    putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
+# endif
+
+    /* Make Xlib hide visuals with an alphachannel. Ensure that Qt4 will not
+     * use the alpha channel for the embedded video window. */
+    putenv( (char *)"XLIB_SKIP_ARGB_VISUALS=1" );
 #endif
 
 #ifndef ALLOW_RUN_AS_ROOT
@@ -74,23 +91,14 @@ int main( int i_argc, const char *ppsz_argv[] )
 
 #ifndef __APPLE__
     /* This clutters OSX GUI error logs */
-    fprintf( stderr, "VLC media player %s\n", libvlc_get_version() );
-#endif
-
-#ifdef HAVE_PUTENV
-#   ifndef NDEBUG
-    /* Activate malloc checking routines to detect heap corruptions. */
-    putenv( (char*)"MALLOC_CHECK_=2" );
-
-    /* Disable the ugly Gnome crash dialog so that we properly segfault */
-    putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
-#   endif
+    fprintf( stderr, "VLC media player %s (revision %s)\n",
+             libvlc_get_version(), libvlc_get_changeset() );
 #endif
 
     /* 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
+     * is to block them in all threads 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.
@@ -133,9 +141,7 @@ int main( int i_argc, const char *ppsz_argv[] )
     argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules");
 #endif
 #ifdef TOP_SRCDIR
-# ifdef ENABLE_HTTPD
-    argv[argc++] = FromLocale ("--http-src="TOP_SRCDIR"/share/http");
-# endif
+    argv[argc++] = FromLocale ("--data-path="TOP_SRCDIR"/share");
 #endif
 
     int i = 1;
@@ -152,36 +158,37 @@ int main( int i_argc, const char *ppsz_argv[] )
             return 1; // BOOM!
     argv[argc] = NULL;
 
-    libvlc_exception_t ex, dummy;
-    libvlc_exception_init (&ex);
-    libvlc_exception_init (&dummy);
+    vlc_enable_override ();
 
     /* Initialize libvlc */
-    libvlc_instance_t *vlc = libvlc_new (argc, argv, &ex);
+    libvlc_instance_t *vlc = libvlc_new (argc, argv);
 
     if (vlc != NULL)
     {
-        libvlc_add_intf (vlc, "signals", &ex);
-        if (libvlc_exception_raised (&ex))
-        {
-            libvlc_exception_clear (&ex);
+        if (libvlc_add_intf (vlc, "signals"))
             pthread_sigmask (SIG_UNBLOCK, &set, NULL);
-        }
 #if !defined (HAVE_MAEMO)
-        libvlc_add_intf (vlc, "globalhotkeys,none", &ex);
+        libvlc_add_intf (vlc, "globalhotkeys,none");
 #endif
-        libvlc_exception_clear (&ex);
-        libvlc_add_intf (vlc, NULL, &ex);
-        libvlc_playlist_play (vlc, -1, 0, NULL, &dummy);
-        libvlc_wait (vlc);
-
-        if (libvlc_exception_raised (&ex))
-            fprintf( stderr, "%s\n", libvlc_errmsg() );
+        if (libvlc_add_intf (vlc, NULL) == 0)
+        {
+            libvlc_playlist_play (vlc, -1, 0, NULL);
+            libvlc_wait (vlc);
+        }
         libvlc_release (vlc);
     }
 
     for (int i = 1; i < argc; i++)
         LocaleFree (argv[i]);
 
-    return vlc == NULL || libvlc_exception_raised (&ex);
+#ifdef RTLD_NOLOAD
+    /* Avoid crash in KIO scheduler cleanup. */
+    /* This is ugly, but we get way too many crash reports due to this. */
+    if (dlopen ("libkfilemodule.so", RTLD_LAZY|RTLD_LOCAL|RTLD_NOLOAD) != NULL)
+    {
+        fprintf (stderr, "KFile plugin present. Unclean shutdown!\n");
+        _exit (0);
+    }
+#endif
+    return 0;
 }