Fixed major crash on Snow Leopard pointed by Pierre

[vlc] / bin / vlc.c

diff --git a/bin/vlc.c b/bin/vlc.c
index ba3b040a8fc5c31f6fe097993a090bc90b58b5ac..b175439ef8344133170bbee6a054f246c1fe4f57 100644 (file)
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -51,6 +51,12 @@ int main( int i_argc, const char *ppsz_argv[] )
 {
     int i_ret;
 
+#ifdef __APPLE__
+    /* The so-called POSIX-compliant MacOS X is not. 
+     * SIGPIPE fires even when it is blocked in all threads! */
+    signal (SIGPIPE, SIG_IGN);
+#endif
+
 #ifndef ALLOW_RUN_AS_ROOT
     if (geteuid () == 0)
     {
@@ -73,9 +79,6 @@ int main( int i_argc, const char *ppsz_argv[] )
 #   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" );
@@ -120,8 +123,20 @@ int main( int i_argc, const char *ppsz_argv[] )
     sigdelset (&set, SIGCHLD);
 
     /* Note that FromLocale() can be used before libvlc is initialized */
-    for (int i = 0; i < i_argc; i++)
-        if ((ppsz_argv[i] = FromLocale (ppsz_argv[i])) == NULL)
+    const char *argv[i_argc + 3];
+    int argc = 0;
+
+#ifdef TOP_BUILDDIR
+    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
+#endif
+
+    for (int i = 1; i < i_argc; i++)
+        if ((argv[argc++] = FromLocale (ppsz_argv[i])) == NULL)
             return 1; // BOOM!
 
     libvlc_exception_t ex, dummy;
@@ -129,9 +144,7 @@ int main( int i_argc, const char *ppsz_argv[] )
     libvlc_exception_init (&dummy);
 
     /* Initialize libvlc */
-    int i_argc_real = i_argc ? i_argc - 1 : 0;
-    const char **ppsz_argv_real = i_argc ? &ppsz_argv[1] : ppsz_argv;
-    libvlc_instance_t *vlc = libvlc_new (i_argc_real, ppsz_argv_real, &ex);
+    libvlc_instance_t *vlc = libvlc_new (argc, argv, &ex);
 
     if (vlc != NULL)
     {
@@ -141,6 +154,8 @@ int main( int i_argc, const char *ppsz_argv[] )
             libvlc_exception_clear (&ex);
             pthread_sigmask (SIG_UNBLOCK, &set, NULL);
         }
+        libvlc_add_intf (vlc, "globalhotkeys,none", &ex);
+        libvlc_exception_clear (&ex);
         libvlc_add_intf (vlc, NULL, &ex);
         libvlc_playlist_play (vlc, -1, 0, NULL, &dummy);
         libvlc_wait (vlc);
@@ -148,13 +163,13 @@ int main( int i_argc, const char *ppsz_argv[] )
     }
     i_ret = libvlc_exception_raised (&ex);
     if( i_ret )
-        fprintf( stderr, "%s\n", libvlc_exception_get_message( &ex));
+        fprintf( stderr, "%s\n", libvlc_errmsg() );
 
     libvlc_exception_clear (&ex);
     libvlc_exception_clear (&dummy);
 
-    for (int i = 0; i < i_argc; i++)
-        LocaleFree (ppsz_argv[i]);
+    for (int i = 0; i < argc; i++)
+        LocaleFree (argv[i]);
 
     return i_ret;
 }