/*****************************************************************************
* vlc.c: the vlc player
*****************************************************************************
- * Copyright (C) 1998-2004 VideoLAN
+ * Copyright (C) 1998-2004 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "config.h"
+#include <vlc/vlc.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>
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
-#if !defined(WIN32) && !defined(UNDER_CE)
-static void SigHandler ( int i_signal );
+#ifdef WIN32
+#include <windows.h>
+extern void __wgetmainargs(int *argc, wchar_t ***wargv, wchar_t ***wenviron,
+ int expand_wildcards, int *startupinfo);
+static inline void Kill(void) { }
+#else
+
+# include <signal.h>
+# include <time.h>
+# include <pthread.h>
+
+static void Kill (void);
+static void *SigHandler (void *set);
#endif
/*****************************************************************************
{
int i_ret;
-#ifndef SYS_DARWIN
+#ifndef __APPLE__
/* This clutters OSX GUI error logs */
fprintf( stderr, "VLC media player %s\n", VLC_Version() );
#endif
#ifdef HAVE_PUTENV
# ifdef DEBUG
/* Activate malloc checking routines to detect heap corruptions. */
- putenv( "MALLOC_CHECK_=2" );
+ putenv( (char*)"MALLOC_CHECK_=2" );
/* Disable the ugly Gnome crash dialog so that we properly segfault */
- putenv( "GNOME_DISABLE_CRASH_DIALOG=1" );
+ 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( "VLC_VERBOSE=0" );
+ putenv( (char *)"VLC_VERBOSE=0" );
}
#endif
+#if defined (HAVE_GETEUID) && !defined (SYS_BEOS)
+ /* FIXME: rootwrap (); */
+#endif
+
/* Create a libvlc structure */
i_ret = VLC_Create();
if( i_ret < 0 )
}
#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. 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.
* Note that we set the signals after the vlc_create call. */
- signal( SIGINT, SigHandler );
- signal( SIGHUP, SigHandler );
- signal( SIGQUIT, SigHandler );
+ static const int sigs[] = { SIGINT, SIGHUP, SIGQUIT, SIGTERM };
+ /* Ignored signals */
+ static const int ignored[] = { SIGALRM, SIGPIPE };
- /* Other signals */
- signal( SIGALRM, SIG_IGN );
- signal( SIGPIPE, SIG_IGN );
+ 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]);
+
+ /* 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]);
+
+ pthread_create (&sigth, NULL, SigHandler, &set);
+#endif
+
+#ifdef WIN32
+ /* Replace argv[1..n] with unicode for Windows NT and above */
+ if( GetVersion() < 0x80000000 )
+ {
+ wchar_t **wargv, **wenvp;
+ int i,i_wargc;
+ int si = { 0 };
+ __wgetmainargs(&i_wargc, &wargv, &wenvp, 0, &si);
+
+ for( i = 1; i < i_wargc; i++ )
+ {
+ int len = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, NULL, 0, NULL, NULL);
+ if( len > 0 )
+ {
+ if( len > 1 ) {
+ char *utf8arg = (char *)malloc(len);
+ if( NULL != utf8arg )
+ {
+ WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, utf8arg, len, NULL, NULL);
+ ppsz_argv[i] = utf8arg;
+ }
+ else
+ {
+ /* failed!, quit */
+ return -1;
+ }
+ }
+ else
+ {
+ ppsz_argv[i] = "";
+ }
+ }
+ else
+ {
+ /* failed!, quit */
+ return -1;
+ }
+ }
+ }
#endif
/* Initialize libvlc */
if( i_ret < 0 )
{
VLC_Destroy( 0 );
- return 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 );
+#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;
}
/*****************************************************************************
* 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;
+ const sigset_t *set = (sigset_t *)data;
+ time_t abort_time = 0;
+ 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 */
+#ifdef __APPLE__
+ /* We really prefer the "force quit" menu item to act immediately */
+ b_die = VLC_TRUE;
+#endif
- if( !b_die )
+ for (;;)
{
- b_die = VLC_TRUE;
- abort_time = time( NULL );
+ int i_signal, state;
+ (void)sigwait (set, &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
+
+ /* 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 */
- fprintf( stderr, "signal %d received, terminating vlc - do it "
- "again in case it gets stuck\n", i_signal );
+ pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state);
+ if (!b_die)
+ {
+ b_die = VLC_TRUE;
+ abort_time = time (NULL);
- /* Acknowledge the signal received */
- VLC_Die( 0 );
+ 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 )
+ {
+ /* If user asks again 1 or 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);
}
- 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 );
+ /* Never reached */
+}
- fprintf( stderr, "user insisted too much, dying badly\n" );
- abort();
+#include <stdbool.h>
+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);
}
+
#endif
#if defined(UNDER_CE)
projects / vlc / blobdiff