#include "config.h"
-#include <stdio.h> /* fprintf() */
-#include <stdlib.h> /* putenv(), strtol(), */
-#ifdef HAVE_SIGNAL_H
-# include <signal.h> /* SIGHUP, SIGINT, SIGKILL */
-#endif
-#ifdef HAVE_TIME_H
-# include <time.h> /* time() */
-#endif
-
#include <vlc/vlc.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <locale.h>
+
+
+/* Explicit HACK */
+extern void LocaleFree (const char *);
+extern char *FromLocale (const char *);
+
+/*****************************************************************************
+ * Local prototypes.
+ *****************************************************************************/
#ifdef WIN32
#include <windows.h>
extern void __wgetmainargs(int *argc, wchar_t ***wargv, wchar_t ***wenviron,
int expand_wildcards, int *startupinfo);
-#endif
+static inline void Kill(void) { }
+#else
-/*****************************************************************************
- * Local prototypes.
- *****************************************************************************/
-#if !defined(WIN32) && !defined(UNDER_CE)
-static void SigHandler ( int i_signal );
+# include <signal.h>
+# include <time.h>
+# include <pthread.h>
+
+static void Kill (void);
+static void *SigHandler (void *set);
#endif
/*****************************************************************************
{
int i_ret;
+ setlocale (LC_ALL, "");
+
#ifndef __APPLE__
/* This clutters OSX GUI error logs */
fprintf( stderr, "VLC media player %s\n", VLC_Version() );
i_ret = VLC_Create();
if( i_ret < 0 )
{
- return i_ret;
+ return -i_ret;
}
#if !defined(WIN32) && !defined(UNDER_CE)
- /* Set the signal handlers. SIGTERM is not intercepted, because we need at
- * least one method to kill the program when all other methods failed, and
- * when we don't want to use SIGKILL.
+ /* Synchronously intercepted signals. They 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. */
- signal( SIGINT, SigHandler );
- signal( SIGHUP, SigHandler );
- signal( SIGQUIT, SigHandler );
+ static const int exitsigs[] = { SIGINT, SIGHUP, SIGQUIT, SIGTERM };
+ static const int dummysigs[] = { SIGALRM, SIGPIPE, SIGCHLD };
+
+ sigset_t set;
+ pthread_t sigth;
+
+ sigemptyset (&set);
+ 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]);
- /* Other signals */
- signal( SIGALRM, SIG_IGN );
- signal( SIGPIPE, SIG_IGN );
+ /* Block all these signals */
+ pthread_sigmask (SIG_BLOCK, &set, NULL);
+
+ for (unsigned i = 0; i < sizeof (dummysigs) / sizeof (dummysigs[0]); i++)
+ sigdelset (&set, dummysigs[i]);
+
+ pthread_create (&sigth, NULL, SigHandler, &set);
#endif
#ifdef WIN32
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
{
- ppsz_argv[i] = "";
+ ppsz_argv[i] = strdup ("");
}
}
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 );
/* Finish the threads */
VLC_CleanUp( 0 );
+ Kill ();
+
/* Destroy the libvlc structure */
VLC_Destroy( 0 );
- return i_ret;
+ for (int i = 0; i < i_argc; i++)
+ LocaleFree (ppsz_argv[i]);
+
+#if !defined(WIN32) && !defined(UNDER_CE)
+ pthread_cancel (sigth);
+# ifdef __APPLE__
+ /* In Mac OS X up to 10.4.8 sigwait (among others) is not a pthread
+ * cancellation point, so we throw a dummy quit signal to end
+ * sigwait() in the sigth thread */
+ pthread_kill (sigth, SIGQUIT);
+# endif
+ pthread_join (sigth, NULL);
+#endif
+
+ return -i_ret;
}
#if !defined(WIN32) && !defined(UNDER_CE)
/*****************************************************************************
* SigHandler: system signal handler
*****************************************************************************
- * This function is called when a fatal signal is received by the program.
+ * This thread receives all handled signals synchronously.
* It tries to end the program in a clean way.
*****************************************************************************/
-static void SigHandler( int i_signal )
+static void *SigHandler (void *data)
{
- static time_t abort_time = 0;
- static volatile vlc_bool_t b_die = VLC_FALSE;
-
- /* 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 */
+ const sigset_t *set = (sigset_t *)data;
+ time_t abort_time = 0;
- if( !b_die )
+ for (;;)
{
- b_die = VLC_TRUE;
- abort_time = time( NULL );
+ int i_signal, state;
+ (void)sigwait (set, &i_signal);
- fprintf( stderr, "signal %d received, terminating vlc - do it "
- "again in case it gets stuck\n", i_signal );
+#ifdef __APPLE__
+ /* In Mac OS X up to 10.4.8 sigwait (among others) is not a pthread
+ * cancellation point */
+ pthread_testcancel();
+#endif
- /* Acknowledge the signal received */
- VLC_Die( 0 );
- }
- else if( time( NULL ) > abort_time + 2 )
- {
- /* If user asks again 1 or 2 seconds later, die badly */
- signal( SIGINT, SIG_DFL );
- signal( SIGHUP, SIG_DFL );
- signal( SIGQUIT, SIG_DFL );
- signal( SIGALRM, SIG_DFL );
- signal( SIGPIPE, SIG_DFL );
+ /* 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 (abort_time == 0)
+ {
+ time (&abort_time);
+ abort_time += 2;
- fprintf( stderr, "user insisted too much, dying badly\n" );
+ fprintf (stderr, "signal %d received, terminating vlc - do it "
+ "again in case it gets stuck\n", i_signal);
- abort();
+ /* Acknowledge the signal received */
+ Kill ();
+ }
+ else
+ if (time (NULL) <= abort_time)
+ {
+ /* If user asks again more than 2 seconds later, die badly */
+ pthread_sigmask (SIG_UNBLOCK, set, NULL);
+ fprintf (stderr, "user insisted too much, dying badly\n");
+ abort ();
+ }
+ pthread_setcancelstate (state, NULL);
}
+ /* Never reached */
}
+
+
+static void KillOnce (void)
+{
+ VLC_Die (0);
+}
+
+static void Kill (void)
+{
+ static pthread_once_t once = PTHREAD_ONCE_INIT;
+ pthread_once (&once, KillOnce);
+}
+
#endif
#if defined(UNDER_CE)
projects / vlc / blobdiff