Use setenv(), safer and cleaner than putenv()

[vlc] / bin / vlc.c

diff --git a/bin/vlc.c b/bin/vlc.c
index 9e769b018cb80fc42eeac674d146dcbc78271658..0f7218e632afd1568a14062fa97a7109b477ed32 100644 (file)
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -50,6 +50,13 @@ extern void vlc_enable_override (void);
 #include <unistd.h>
 #include <dlfcn.h>
 
+#ifdef HAVE_MAEMO
+static void dummy_handler (int signum)
+{
+    (void) signum;
+}
+#endif
+
 /*****************************************************************************
  * main: parse command line, start interface and spawn threads.
  *****************************************************************************/
@@ -62,18 +69,23 @@ int main( int i_argc, const char *ppsz_argv[] )
      * LibVLC runs outside of VLC, we cannot rely on this code snippet. */
     signal (SIGPIPE, SIG_IGN);
 
-#ifdef HAVE_PUTENV
+#ifdef HAVE_SETENV
 # ifndef NDEBUG
     /* Activate malloc checking routines to detect heap corruptions. */
-    putenv( (char*)"MALLOC_CHECK_=2" );
+    setenv ("MALLOC_CHECK_", "2", 1);
 
     /* Disable the ugly Gnome crash dialog so that we properly segfault */
-    putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
+    setenv ("GNOME_DISABLE_CRASH_DIALOG", "1", 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" );
+    setenv ("XLIB_SKIP_ARGB_VISUALS", "1", 1);
+
+    /* Clear the X.Org startup notification ID. Otherwise the UI might try to
+     * change the environment while the process is multi-threaded. That could
+     * crash. Screw you X.Org. Next time write a thread-safe specification. */
+    unsetenv ("DESKTOP_STARTUP_ID");
 #endif
 
 #ifndef ALLOW_RUN_AS_ROOT
@@ -126,6 +138,13 @@ int main( int i_argc, const char *ppsz_argv[] )
     sigemptyset (&set);
     for (unsigned i = 0; i < sizeof (sigs) / sizeof (sigs[0]); i++)
         sigaddset (&set, sigs[i]);
+#ifdef HAVE_MAEMO
+    sigaddset (&set, SIGRTMIN);
+    {
+        struct sigaction act = { .sa_handler = dummy_handler, };
+        sigaction (SIGRTMIN, &act, NULL);
+    }
+#endif
 
     /* Block all these signals */
     pthread_sigmask (SIG_BLOCK, &set, NULL);
@@ -184,9 +203,10 @@ int main( int i_argc, const char *ppsz_argv[] )
 #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)
+    if (dlopen ("libkio.so.5", RTLD_LAZY|RTLD_LOCAL|RTLD_NOLOAD) != NULL)
     {
-        fprintf (stderr, "KFile plugin present. Unclean shutdown!\n");
+        fprintf (stderr, "KIO present. Unclean shutdown!\n"
+           " (see http://bugs.kde.org/show_bug.cgi?id=234484 for details)\n");
         _exit (0);
     }
 #endif