*****************************************************************************/
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)
{
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;
}
+#endif
setlocale (LC_ALL, "");
# 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
#endif
-#if defined (HAVE_GETEUID) && !defined (SYS_BEOS)
- /* FIXME: rootwrap (); */
-#endif
-
/* Synchronously intercepted POSIX signals.
*
* In a threaded program such as VLC, the only sane way to handle signals
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
/* 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;
+
+#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;
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)
{
- libvlc_add_intf (vlc, "signals", &dummy);
+ libvlc_add_intf (vlc, "signals", &ex);
+ if (libvlc_exception_raised (&ex))
+ {
+ 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);
+
+ if (libvlc_exception_raised (&ex))
+ fprintf( stderr, "%s\n", libvlc_errmsg() );
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 = 0; i < argc; i++)
+ LocaleFree (argv[i]);
- return i_ret;
+ return vlc == NULL || libvlc_exception_raised (&ex);
}