X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fvlc.c;h=77f793cbc6cbb6e79bb6dc06ae599ef0dd0970c9;hb=8d7e530f40ef0dfa7de448f786da40c066db9278;hp=bdf21e7bc6f1482559210eaef8131ba5ab331745;hpb=1d58919125812d569c23bde687e42fca86858e33;p=vlc diff --git a/src/vlc.c b/src/vlc.c index bdf21e7bc6..77f793cbc6 100644 --- a/src/vlc.c +++ b/src/vlc.c @@ -28,8 +28,14 @@ #include "config.h" #include -#include /* fprintf() */ -#include /* putenv(), strtol(), */ +#include +#include +#include + + +/* Explicit HACK */ +extern void LocaleFree (const char *); +extern char *FromLocale (const char *); /***************************************************************************** @@ -39,19 +45,14 @@ #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 -# include - -static struct -{ - bool flag; - pthread_mutex_t lock; -} live = { true, PTHREAD_MUTEX_INITIALIZER }; +static void Kill (void); static void *SigHandler (void *set); #endif @@ -62,6 +63,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() ); @@ -91,32 +94,31 @@ int main( int i_argc, char *ppsz_argv[] ) 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, + /* 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. */ - static const int sigs[] = { SIGINT, SIGHUP, SIGQUIT, SIGTERM }; - /* Ignored signals */ - static const int ignored[] = { SIGALRM, SIGPIPE }; + 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 (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 @@ -130,7 +132,7 @@ int main( int i_argc, char *ppsz_argv[] ) 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 ) @@ -145,29 +147,35 @@ int main( int i_argc, char *ppsz_argv[] ) 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 ); @@ -175,15 +183,26 @@ int main( int i_argc, char *ppsz_argv[] ) /* Finish the threads */ VLC_CleanUp( 0 ); + Kill (); + /* 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__ + /* 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; + return -i_ret; } #if !defined(WIN32) && !defined(UNDER_CE) @@ -197,38 +216,38 @@ static void *SigHandler (void *data) { const sigset_t *set = (sigset_t *)data; time_t abort_time = 0; - vlc_bool_t b_die = VLC_FALSE; for (;;) { 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 */ 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 */ - pthread_mutex_lock (&live.lock); - if (live.flag) - { - VLC_Die (0); - live.flag = false; - } - pthread_mutex_unlock (&live.lock); + 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 */ + /* 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 (); @@ -237,6 +256,19 @@ static void *SigHandler (void *data) } /* 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)