X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvlc.c;h=2ede9433e4b67ff029654d1266ec13cec7cb9369;hb=981577922c4384c7cd349217e49e75a658fd5882;hp=9bd3242ca0e6b7bc22356b7981f373e3eff1f570;hpb=1c3bc8974c3b0acf191be3e5ebaf4c00634411fa;p=vlc diff --git a/src/vlc.c b/src/vlc.c index 9bd3242ca0..2ede9433e4 100644 --- a/src/vlc.c +++ b/src/vlc.c @@ -1,7 +1,7 @@ /***************************************************************************** - * vlc.c: the vlc player + * vlc.c: the VLC player ***************************************************************************** - * Copyright (C) 1998-2004 the VideoLAN team + * Copyright (C) 1998-2008 the VideoLAN team * $Id$ * * Authors: Vincent Seguin @@ -25,214 +25,131 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include "config.h" - -#include /* fprintf() */ -#include /* putenv(), strtol(), */ -#ifdef HAVE_SIGNAL_H -# include /* SIGHUP, SIGINT, SIGKILL */ -#endif -#ifdef HAVE_TIME_H -# include /* time() */ +#ifdef HAVE_CONFIG_H +# include "config.h" #endif #include +#include +#include +#include -#ifdef WIN32 -#include -extern void __wgetmainargs(int *argc, wchar_t ***wargv, wchar_t ***wenviron, - int expand_wildcards, int *startupinfo); -#endif -/***************************************************************************** - * Local prototypes. - *****************************************************************************/ -#if !defined(WIN32) && !defined(UNDER_CE) -static void SigHandler ( int i_signal ); -#endif +/* Explicit HACK */ +extern void LocaleFree (const char *); +extern char *FromLocale (const char *); + +#include +#include +#include +#include /***************************************************************************** * 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; + if (geteuid () == 0) + { + fprintf (stderr, "VLC is not supposed to be run as root. Sorry.\n" + "If you need to use real-time priorities and/or privileged TCP ports\n" + "you can use %s-wrapper (make sure it is Set-UID root first and\n" + "cannot be run by non-trusted users first).\n", ppsz_argv[0]); + return 1; + } + + setlocale (LC_ALL, ""); + #ifndef __APPLE__ /* This clutters OSX GUI error logs */ - fprintf( stderr, "VLC media player %s\n", VLC_Version() ); + fprintf( stderr, "VLC media player %s\n", libvlc_get_version() ); #endif #ifdef HAVE_PUTENV -# ifdef DEBUG +# ifndef NDEBUG /* Activate malloc checking routines to detect heap corruptions. */ putenv( (char*)"MALLOC_CHECK_=2" ); +# ifdef __APPLE__ + putenv( (char*)"MallocErrorAbort=crash_my_baby_crash" ); +# endif /* 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) /* FIXME: rootwrap (); */ #endif - /* Create a libvlc structure */ - i_ret = VLC_Create(); - if( i_ret < 0 ) - { - 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 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. */ - signal( SIGINT, SigHandler ); - signal( SIGHUP, SigHandler ); - signal( SIGQUIT, SigHandler ); - - /* Other signals */ - signal( SIGALRM, SIG_IGN ); - signal( SIGPIPE, SIG_IGN ); -#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 + static const int sigs[] = { + SIGINT, SIGHUP, SIGQUIT, SIGTERM, + /* Signals that cause a no-op: + * - SIGPIPE might happen with sockets and would crash VLC. It MUST be + * blocked by any LibVLC-dependent application, in addition to VLC. + * - SIGCHLD is comes after exec*() (such as httpd CGI support) and must + * be dequeued to cleanup zombie processes. + */ + SIGPIPE, SIGCHLD + }; + + sigset_t set; + sigemptyset (&set); + for (unsigned i = 0; i < sizeof (sigs) / sizeof (sigs[0]); i++) + sigaddset (&set, sigs[i]); + + /* Block all these signals */ + pthread_sigmask (SIG_BLOCK, &set, NULL); + + /* Note that FromLocale() can be used before libvlc is initialized */ + for (int i = 0; i < i_argc; i++) + if ((ppsz_argv[i] = FromLocale (ppsz_argv[i])) == NULL) + return 1; // BOOM! + + libvlc_exception_t ex, dummy; + libvlc_exception_init (&ex); + libvlc_exception_init (&dummy); /* 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; - } - - i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE, VLC_TRUE ); - - /* Finish the threads */ - VLC_CleanUp( 0 ); + int i_argc_real = i_argc ? i_argc - 1 : 0; + const char **ppsz_argv_real = i_argc ? &ppsz_argv[1] : ppsz_argv; + libvlc_instance_t *vlc = libvlc_new (i_argc_real, ppsz_argv_real, &ex); - /* Destroy the libvlc structure */ - VLC_Destroy( 0 ); - - 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. - * It tries to end the program in a clean way. - *****************************************************************************/ -static void SigHandler( int i_signal ) -{ - 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 */ - - if( !b_die ) - { - b_die = VLC_TRUE; - abort_time = time( NULL ); - - fprintf( stderr, "signal %d received, terminating vlc - do it " - "again in case it gets stuck\n", i_signal ); - - /* Acknowledge the signal received */ - VLC_Die( 0 ); - } - else if( time( NULL ) > abort_time + 2 ) + if (vlc != NULL) { - /* 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 ); - - fprintf( stderr, "user insisted too much, dying badly\n" ); - - abort(); + libvlc_add_intf (vlc, "signals", &dummy); + libvlc_add_intf (vlc, NULL, &ex); + libvlc_playlist_play (vlc, -1, 0, NULL, &dummy); + libvlc_wait (vlc); + libvlc_release (vlc); } -} -#endif + i_ret = libvlc_exception_raised (&ex); + if( i_ret ) + fprintf( stderr, "%s\n", libvlc_exception_get_message( &ex)); -#if defined(UNDER_CE) -# if defined( _MSC_VER ) && defined( UNDER_CE ) -# include "vlc_common.h" -# endif -/***************************************************************************** - * WinMain: parse command line, start interface and spawn threads. (WinCE only) - *****************************************************************************/ -int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, int nCmdShow ) -{ - char **argv, psz_cmdline[MAX_PATH]; - int argc, i_ret; - - WideCharToMultiByte( CP_ACP, 0, lpCmdLine, -1, - psz_cmdline, MAX_PATH, NULL, NULL ); + libvlc_exception_clear (&ex); + libvlc_exception_clear (&dummy); - argv = vlc_parse_cmdline( psz_cmdline, &argc ); - argv = realloc( argv, (argc + 1) * sizeof(char *) ); - if( !argv ) return -1; + for (int i = 0; i < i_argc; i++) + LocaleFree (ppsz_argv[i]); - if( argc ) memmove( argv + 1, argv, argc * sizeof(char *) ); - argv[0] = ""; /* Fake program path */ - - i_ret = main( argc + 1, argv ); - - /* No need to free the argv memory */ return i_ret; } -#endif