X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvlc.c;h=94709d22c7551dc61aa8d0d3672a91b2b6a3d923;hb=18ce8f4b3eedd946fc1a0fed2271b0e77b21a585;hp=2f2750ad55f4d6b391a7ed8696e48b346563b6d5;hpb=b76d7cf6283749d91448cb2b175f7cd9889fbe02;p=vlc diff --git a/src/vlc.c b/src/vlc.c index 2f2750ad55..94709d22c7 100644 --- a/src/vlc.c +++ b/src/vlc.c @@ -27,25 +27,33 @@ #include "config.h" +#include #include /* fprintf() */ #include /* putenv(), strtol(), */ -#ifdef HAVE_SIGNAL_H -# include /* SIGHUP, SIGINT, SIGKILL */ -#endif -#ifdef HAVE_TIME_H -# include /* time() */ -#endif +#include + +/* Explicit HACK */ +extern void LocaleFree (const char *); +extern char *FromLocale (const char *); -#include /***************************************************************************** * Local prototypes. *****************************************************************************/ -#if !defined(WIN32) && !defined(UNDER_CE) -static void SigHandler ( int i_signal ); -#endif +#ifdef WIN32 +#include +extern void __wgetmainargs(int *argc, wchar_t ***wargv, wchar_t ***wenviron, + int expand_wildcards, int *startupinfo); +static inline void Kill(void) { } +#else + +# include +# include +# include -extern void rootwrap( void ); +static void Kill (void); +static void *SigHandler (void *set); +#endif /***************************************************************************** * main: parse command line, start interface and spawn threads. @@ -54,6 +62,8 @@ int main( int i_argc, char *ppsz_argv[] ) { int i_ret; + setlocale (LC_ALL, ""); + #ifndef __APPLE__ /* This clutters OSX GUI error logs */ fprintf( stderr, "VLC media player %s\n", VLC_Version() ); @@ -62,48 +72,109 @@ int main( int i_argc, char *ppsz_argv[] ) #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 - rootwrap (); - +#if defined (HAVE_GETEUID) && !defined (SYS_BEOS) + /* FIXME: rootwrap (); */ +#endif + /* Create a libvlc structure */ 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. 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 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]); + + /* 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]); - /* Other signals */ - signal( SIGALRM, SIG_IGN ); - signal( SIGPIPE, SIG_IGN ); + 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 = 0; 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] = strdup (""); + } + } + else + { + /* failed!, quit */ + 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 ); @@ -111,53 +182,92 @@ int main( int i_argc, char *ppsz_argv[] ) /* 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)