#include "config.h"
#include <vlc/vlc.h>
-#include <stdio.h> /* fprintf() */
-#include <stdlib.h> /* putenv(), strtol(), */
+#include <stdio.h>
+#include <stdlib.h>
#include <locale.h>
+/* Explicit HACK */
+extern void LocaleFree (const char *);
+extern char *FromLocale (const char *);
+
+
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
/*****************************************************************************
* main: parse command line, start interface and spawn threads.
*****************************************************************************/
-int main( int i_argc, char *ppsz_argv[] )
+int main( int i_argc, const char *ppsz_argv[] )
{
int i_ret;
/* Disable the ugly Gnome crash dialog so that we properly segfault */
putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
# endif
-
- /* If the user isn't using VLC_VERBOSE, set it to 0 by default */
- if( getenv( "VLC_VERBOSE" ) == NULL )
- {
- putenv( (char *)"VLC_VERBOSE=0" );
- }
#endif
#if defined (HAVE_GETEUID) && !defined (SYS_BEOS)
i_ret = VLC_Create();
if( i_ret < 0 )
{
- return i_ret;
+ return -i_ret;
}
#if !defined(WIN32) && !defined(UNDER_CE)
- /* Synchronously intercepted signals. Thy request a clean shutdown,
- * and force an unclean shutdown if they are triggered again 2+ seconds
- * later. We have to handle SIGTERM cleanly because of daemon mode.
+ /* 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
+ * 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.
+ * There is only one exception: if the signal is raised with
+ * pthread_kill() - we do not use this in LibVLC but some pthread
+ * implementations use them internally. You should really use conditions
+ * for thread synchronization anyway.
+ *
+ * Signal that request a clean shutdown, and force an unclean shutdown
+ * if they are triggered again 2+ seconds later.
+ * We have to handle SIGTERM cleanly because of daemon mode.
* Note that we set the signals after the vlc_create call. */
- static const int sigs[] = { SIGINT, SIGHUP, SIGQUIT, SIGTERM };
- /* Ignored signals */
- static const int ignored[] = { SIGALRM, SIGPIPE };
+ static const int exitsigs[] = { SIGINT, SIGHUP, SIGQUIT, SIGTERM };
+ /* Signals that cause a no-op:
+ * - SIGALRM should not happen, but lets stay on the safe side.
+ * - SIGPIPE might happen with sockets and would crash VLC. It MUST be
+ * blocked by any LibVLC-dependant application, in addition to VLC.
+ * - SIGCHLD is comes after exec*() (such as httpd CGI support) and must
+ * be dequeued to cleanup zombie processes.
+ */
+ static const int dummysigs[] = { SIGALRM, SIGPIPE, SIGCHLD };
sigset_t set;
pthread_t sigth;
sigemptyset (&set);
- for (unsigned i = 0; i < sizeof (sigs) / sizeof (sigs[0]); i++)
- sigaddset (&set, sigs[i]);
- for (unsigned i = 0; i < sizeof (ignored) / sizeof (ignored[0]); i++)
- sigaddset (&set, ignored[i]);
+ for (unsigned i = 0; i < sizeof (exitsigs) / sizeof (exitsigs[0]); i++)
+ sigaddset (&set, exitsigs[i]);
+ for (unsigned i = 0; i < sizeof (dummysigs) / sizeof (dummysigs[0]); i++)
+ sigaddset (&set, dummysigs[i]);
/* Block all these signals */
pthread_sigmask (SIG_BLOCK, &set, NULL);
- for (unsigned i = 0; i < sizeof (ignored) / sizeof (ignored[0]); i++)
- sigdelset (&set, ignored[i]);
+ for (unsigned i = 0; i < sizeof (dummysigs) / sizeof (dummysigs[0]); i++)
+ sigdelset (&set, dummysigs[i]);
pthread_create (&sigth, NULL, SigHandler, &set);
#endif
int si = { 0 };
__wgetmainargs(&i_wargc, &wargv, &wenvp, 0, &si);
- for( i = 1; i < i_wargc; i++ )
+ for( i = 0; i < i_wargc; i++ )
{
int len = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, NULL, 0, NULL, NULL);
if( len > 0 )
else
{
/* failed!, quit */
- return -1;
+ return 1;
}
}
else
else
{
/* failed!, quit */
- return -1;
+ return 1;
}
}
}
+ else
#endif
+ {
+ for (int i = 0; i < i_argc; i++)
+ if ((ppsz_argv[i] = FromLocale (ppsz_argv[i])) == NULL)
+ return 1; // BOOM!
+ }
/* Initialize libvlc */
i_ret = VLC_Init( 0, i_argc, ppsz_argv );
if( i_ret < 0 )
{
VLC_Destroy( 0 );
- return i_ret == VLC_EEXITSUCCESS ? 0 : i_ret;
+ return i_ret == VLC_EEXITSUCCESS ? 0 : -i_ret;
}
i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE, VLC_TRUE );
/* Destroy the libvlc structure */
VLC_Destroy( 0 );
+ for (int i = 0; i < i_argc; i++)
+ LocaleFree (ppsz_argv[i]);
+
#if !defined(WIN32) && !defined(UNDER_CE)
pthread_cancel (sigth);
# ifdef __APPLE__
pthread_join (sigth, NULL);
#endif
- return i_ret;
+ return -i_ret;
}
#if !defined(WIN32) && !defined(UNDER_CE)
*****************************************************************************/
static void *SigHandler (void *data)
{
- const sigset_t *set = (sigset_t *)data;
+ const sigset_t *exitset = (sigset_t *)data;
+ sigset_t fullset;
time_t abort_time = 0;
- vlc_bool_t b_die = VLC_FALSE;
-#ifdef __APPLE__
- /* We really prefer the "force quit" menu item to act immediately */
- b_die = VLC_TRUE;
-#endif
+ pthread_sigmask (SIG_BLOCK, exitset, &fullset);
for (;;)
{
int i_signal, state;
- (void)sigwait (set, &i_signal);
+ if( sigwait (&fullset, &i_signal) != 0 )
+ continue;
#ifdef __APPLE__
/* In Mac OS X up to 10.4.8 sigwait (among others) is not a pthread
pthread_testcancel();
#endif
+ if (!sigismember (exitset, i_signal))
+ continue; /* Ignore "dummy" signals */
+
/* Once a signal has been trapped, the termination sequence will be
* armed and subsequent signals will be ignored to avoid sending
* signals to a libvlc structure having been destroyed */
pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state);
- if (!b_die)
+ if (abort_time == 0)
{
- b_die = VLC_TRUE;
- abort_time = time (NULL);
+ time (&abort_time);
+ abort_time += 2;
fprintf (stderr, "signal %d received, terminating vlc - do it "
"again in case it gets stuck\n", i_signal);
/* Acknowledge the signal received */
Kill ();
}
- else if( time( NULL ) > abort_time + 2 )
+ else
+ if (time (NULL) <= abort_time)
{
- /* If user asks again 1 or 2 seconds later, die badly */
- pthread_sigmask (SIG_UNBLOCK, set, NULL);
+ /* If user asks again more than 2 seconds later, die badly */
+ pthread_sigmask (SIG_UNBLOCK, exitset, NULL);
fprintf (stderr, "user insisted too much, dying badly\n");
abort ();
}
}
-#include <stdbool.h>
+static void KillOnce (void)
+{
+ VLC_Die (0);
+}
+
static void Kill (void)
{
- static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
- static bool killed = false;;
- pthread_mutex_lock (&lock);
- if (!killed)
- {
- VLC_Die (0);
- killed = true;
- }
- pthread_mutex_unlock (&lock);
+ static pthread_once_t once = PTHREAD_ONCE_INIT;
+ pthread_once (&once, KillOnce);
}
#endif
projects / vlc / blobdiff