static void vlc_kill (void *data)
{
+#ifndef __OS2__
pthread_t *ps = data;
pthread_kill (*ps, SIGTERM);
+#else
+ // send a signal to the main thread
+ kill (getpid(), SIGTERM);
+#endif
}
static void exit_timeout (int signum)
/* Restore SIGCHLD in case our parent process ignores it. */
signal (SIGCHLD, SIG_DFL);
-#ifdef HAVE_SETENV
-# ifndef NDEBUG
+#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
+#endif
+
+#ifdef TOP_BUILDDIR
+ setenv ("VLC_PLUGIN_PATH", TOP_BUILDDIR"/modules", 1);
+#endif
/* 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)
setlocale (LC_ALL, "");
-#ifndef __APPLE__
- /* This clutters OSX GUI error logs */
- fprintf( stderr, "VLC media player %s (revision %s)\n",
- libvlc_get_version(), libvlc_get_changeset() );
-#endif
+ if (isatty (STDERR_FILENO))
+ /* This message clutters error logs. It is print it only on a TTY.
+ * Forunately, LibVLC prints version infos with -vv anyhow. */
+ fprintf (stderr, "VLC media player %s (revision %s)\n",
+ libvlc_get_version(), libvlc_get_changeset());
sigset_t set;
pthread_sigmask (SIG_SETMASK, &set, NULL);
/* Note that FromLocale() can be used before libvlc is initialized */
- const char *argv[i_argc + 4];
+ const char *argv[i_argc + 3];
int argc = 0;
argv[argc++] = "--no-ignore-config";
argv[argc++] = "--media-library";
-#ifdef TOP_BUILDDIR
- argv[argc++] = FromLocale ("--plugin-path="TOP_BUILDDIR"/modules");
-#endif
#ifdef TOP_SRCDIR
argv[argc++] = FromLocale ("--data-path="TOP_SRCDIR"/share");
#endif
libvlc_set_user_agent (vlc, "VLC media player", "VLC/"PACKAGE_VERSION);
-#if !defined (HAVE_MAEMO) && !defined __APPLE__
+#if !defined (HAVE_MAEMO) && !defined __APPLE__ && !defined (__OS2__)
libvlc_add_intf (vlc, "globalhotkeys,none");
#endif
if (libvlc_add_intf (vlc, NULL))
pthread_t self = pthread_self ();
libvlc_set_exit_handler (vlc, vlc_kill, &self);
- if (signal_ignored (SIGHUP)) /* <- needed to handle nohup properly */
+ /* Qt4 insists on catching SIGCHLD via signal handler. To work around that,
+ * unblock it after all our child threads are created. */
+ sigdelset (&set, SIGCHLD);
+ pthread_sigmask (SIG_SETMASK, &set, NULL);
+
+ /* Do not dequeue SIGHUP if it is ignored (nohup) */
+ if (signal_ignored (SIGHUP))
sigdelset (&set, SIGHUP);
+ /* Ignore SIGPIPE */
sigdelset (&set, SIGPIPE);
int signum;
- do
- sigwait (&set, &signum);
- while (signum == SIGCHLD);
+ sigwait (&set, &signum);
/* Restore default signal behaviour after 3 seconds */
sigemptyset (&set);
out:
if (vlc != NULL)
libvlc_release (vlc);
- for (int i = 1; i < argc; i++)
+ for (int i = 2; i < argc; i++)
LocaleFree (argv[i]);
return 0;