Add a secret --user-agent option to pass the application name

[vlc] / bin / vlc.c

diff --git a/bin/vlc.c b/bin/vlc.c
index 034f0cae45d4af8ca1c839f8c86a38e249901270..447b808d5438cf2e85f88cddc8a557dbac57ed82 100644 (file)
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -68,21 +68,22 @@ int main( int i_argc, const char *ppsz_argv[] )
      * 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);
+    /* Restore default for SIGCHLD in case parent ignores it. */
+    signal (SIGCHLD, SIG_DFL);
 
-#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" );
-#endif
-#ifdef HAVE_SETENV
+    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. */
@@ -153,10 +154,11 @@ int main( int i_argc, const char *ppsz_argv[] )
     sigdelset (&set, SIGCHLD);
 
     /* Note that FromLocale() can be used before libvlc is initialized */
-    const char *argv[i_argc + 3];
+    const char *argv[i_argc + 4];
     int argc = 0;
 
     argv[argc++] = "--no-ignore-config";
+    argv[argc++] = "--user-agent=\"VLC media player\"";
 #ifdef TOP_BUILDDIR
     argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules");
 #endif