X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=bin%2Fvlc.c;h=0f7218e632afd1568a14062fa97a7109b477ed32;hb=61f8e439fdaf29c2489ef4511f4fa2d17a38d1e6;hp=30c83fcc827992831000f319b32efa8b8bdc76e4;hpb=675111cc7bbf4d6839761f1050b1518ed877d97b;p=vlc diff --git a/bin/vlc.c b/bin/vlc.c index 30c83fcc82..0f7218e632 100644 --- a/bin/vlc.c +++ b/bin/vlc.c @@ -34,29 +34,66 @@ #include #include +#ifdef __APPLE__ +#include +#endif + /* Explicit HACK */ extern void LocaleFree (const char *); extern char *FromLocale (const char *); +extern void vlc_enable_override (void); #include #include #include #include +#include + +#ifdef HAVE_MAEMO +static void dummy_handler (int signum) +{ + (void) signum; +} +#endif /***************************************************************************** * main: parse command line, start interface and spawn threads. *****************************************************************************/ int main( int i_argc, const char *ppsz_argv[] ) { - int i_ret; + /* 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_SETENV +# ifndef NDEBUG + /* Activate malloc checking routines to detect heap corruptions. */ + setenv ("MALLOC_CHECK_", "2", 1); + + /* Disable the ugly Gnome crash dialog so that we properly segfault */ + 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. */ + 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 if (geteuid () == 0) { fprintf (stderr, "VLC is not supposed to be run as root. Sorry.\n" "If you need to use real-time priorities and/or privileged TCP ports\n" - "you can use %s-wrapper (make sure it is Set-UID root first and\n" + "you can use %s-wrapper (make sure it is Set-UID root and\n" "cannot be run by non-trusted users first).\n", ppsz_argv[0]); return 1; } @@ -66,26 +103,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" ); -# 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" ); -# 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. @@ -102,8 +127,8 @@ int main( int i_argc, const char *ppsz_argv[] ) SIGINT, SIGHUP, SIGQUIT, SIGTERM, /* Signals that cause a no-op: * - SIGPIPE might happen with sockets and would crash VLC. It MUST be - * blocked by any LibVLC-dependent application, in addition to VLC. - * - SIGCHLD is comes after exec*() (such as httpd CGI support) and must + * blocked by any LibVLC-dependent application, not just VLC. + * - SIGCHLD comes after exec*() (such as httpd CGI support) and must * be dequeued to cleanup zombie processes. */ SIGPIPE, SIGCHLD @@ -113,41 +138,77 @@ 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); + sigdelset (&set, SIGPIPE); + 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; + + argv[argc++] = "--no-ignore-config"; +#ifdef TOP_BUILDDIR + argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules"); +#endif +#ifdef TOP_SRCDIR + argv[argc++] = FromLocale ("--data-path="TOP_SRCDIR"/share"); +#endif + + int i = 1; +#ifdef __APPLE__ + /* When VLC.app is run by double clicking in Mac OS X, the 2nd arg + * is the PSN - process serial number (a unique PID-ish thingie) + * still ok for real Darwin & when run from command line + * for example -psn_0_9306113 */ + if(i_argc >= 2 && !strncmp( ppsz_argv[1] , "-psn" , 4 )) + i = 2; +#endif + for (; i < i_argc; i++) + if ((argv[argc++] = FromLocale (ppsz_argv[i])) == NULL) return 1; // BOOM! + argv[argc] = NULL; - libvlc_exception_t ex, dummy; - libvlc_exception_init (&ex); - libvlc_exception_init (&dummy); + vlc_enable_override (); /* 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); if (vlc != NULL) { - libvlc_add_intf (vlc, "signals", &dummy); - libvlc_add_intf (vlc, NULL, &ex); - libvlc_playlist_play (vlc, -1, 0, NULL, &dummy); - libvlc_wait (vlc); + if (libvlc_add_intf (vlc, "signals")) + pthread_sigmask (SIG_UNBLOCK, &set, NULL); +#if !defined (HAVE_MAEMO) + libvlc_add_intf (vlc, "globalhotkeys,none"); +#endif + if (libvlc_add_intf (vlc, NULL) == 0) + { + libvlc_playlist_play (vlc, -1, 0, NULL); + libvlc_wait (vlc); + } libvlc_release (vlc); } - i_ret = libvlc_exception_raised (&ex); - if( i_ret ) - fprintf( stderr, "%s\n", libvlc_exception_get_message( &ex)); - - libvlc_exception_clear (&ex); - libvlc_exception_clear (&dummy); - for (int i = 0; i < i_argc; i++) - LocaleFree (ppsz_argv[i]); + for (int i = 1; i < argc; i++) + LocaleFree (argv[i]); - return i_ret; +#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 ("libkio.so.5", RTLD_LAZY|RTLD_LOCAL|RTLD_NOLOAD) != NULL) + { + fprintf (stderr, "KIO present. Unclean shutdown!\n" + " (see http://bugs.kde.org/show_bug.cgi?id=234484 for details)\n"); + _exit (0); + } +#endif + return 0; }