X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvlc.c;h=2ede9433e4b67ff029654d1266ec13cec7cb9369;hb=31a163942d6682ae31679e6e2be898f9314b2cc0;hp=deaba4bedfb2d52fd66ef234236da049be2766cb;hpb=2a855b131692979ae954939ad5d5a7d78cc21b44;p=vlc diff --git a/src/vlc.c b/src/vlc.c index deaba4bedf..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 @@ -39,22 +39,10 @@ extern void LocaleFree (const char *); extern char *FromLocale (const char *); - -/***************************************************************************** - * Local prototypes. - *****************************************************************************/ -#ifdef WIN32 -#include -extern void __wgetmainargs(int *argc, wchar_t ***wargv, wchar_t ***wenviron, - int expand_wildcards, int *startupinfo); -#else - -# include -# include -# include - -static void *SigHandler (void *set); -#endif +#include +#include +#include +#include /***************************************************************************** * main: parse command line, start interface and spawn threads. @@ -63,6 +51,15 @@ 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__ @@ -87,7 +84,6 @@ int main( int i_argc, const char *ppsz_argv[] ) /* FIXME: rootwrap (); */ #endif -#if !defined(WIN32) && !defined(UNDER_CE) /* Synchronously intercepted POSIX signals. * * In a threaded program such as VLC, the only sane way to handle signals @@ -104,204 +100,56 @@ int main( int i_argc, const char *ppsz_argv[] ) * 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 exitsigs[] = { SIGINT, SIGHUP, SIGQUIT, SIGTERM }; + static const int sigs[] = { + SIGINT, SIGHUP, SIGQUIT, SIGTERM, /* Signals that cause a no-op: - * - SIGALRM should not happen, but lets stay on the safe side. * - SIGPIPE might happen with sockets and would crash VLC. It MUST be - * blocked by any LibVLC-dependant application, in addition to VLC. + * 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. */ - static const int dummysigs[] = { SIGALRM, SIGPIPE, SIGCHLD }; + 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]); + 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); - for (unsigned i = 0; i < sizeof (dummysigs) / sizeof (dummysigs[0]); i++) - sigdelset (&set, dummysigs[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 = 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 - { - /* 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! - } + /* 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; + libvlc_exception_t ex, dummy; libvlc_exception_init (&ex); + libvlc_exception_init (&dummy); /* Initialize libvlc */ - libvlc_instance_t *vlc = libvlc_new (i_argc, ppsz_argv, &ex); + 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); + if (vlc != NULL) { - libvlc_run_interface (vlc, NULL, &ex); + 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); } i_ret = libvlc_exception_raised (&ex); + if( i_ret ) + fprintf( stderr, "%s\n", libvlc_exception_get_message( &ex)); + libvlc_exception_clear (&ex); + libvlc_exception_clear (&dummy); 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 thread receives all handled signals synchronously. - * It tries to end the program in a clean way. - *****************************************************************************/ -static void *SigHandler (void *data) -{ - const sigset_t *exitset = (sigset_t *)data; - sigset_t fullset; - time_t abort_time = 0; - - pthread_sigmask (SIG_BLOCK, exitset, &fullset); - - for (;;) - { - int i_signal, state; - if( sigwait (&fullset, &i_signal) != 0 ) - continue; - -#ifdef __APPLE__ - /* In Mac OS X up to 10.4.8 sigwait (among others) is not a pthread - * cancellation point */ - pthread_testcancel(); -#endif - - if (!sigismember (exitset, i_signal)) - continue; /* Ignore "dummy" signals */ - - /* 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 (NULL) > abort_time) - { - time (&abort_time); - abort_time += 2; - - fprintf (stderr, "signal %d received, terminating vlc - do it " - "again quickly in case it gets stuck\n", i_signal); - //VLC_Die( 0 ); - } - else /* time (NULL) <= abort_time */ - { - /* If user asks again more than 2 seconds later, die badly */ - pthread_sigmask (SIG_UNBLOCK, exitset, NULL); - fprintf (stderr, "user insisted too much, dying badly\n"); -#ifdef __APPLE__ - /* On Mac OS X, use exit(-1) as it doesn't trigger - * backtrace generation, whereas abort() does. - * The backtrace generation trigger a Crash Dialog - * And takes way too much time, which is not what - * we want. */ - exit (-1); -#else - abort (); -#endif - } - pthread_setcancelstate (state, NULL); - } - /* Never reached */ -} -#endif - -#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 ); - - argv = vlc_parse_cmdline( psz_cmdline, &argc ); - argv = realloc( argv, (argc + 1) * sizeof(char *) ); - if( !argv ) return -1; - - 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