* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_input.h>
#include <vlc_interface.h>
#include <sys/wait.h>
#include <unistd.h>
+#ifdef HAVE_SIGNAL_H
+# include <signal.h>
+#endif
+
#ifdef HAVE_DBUS
#define DBUS_API_SUBJECT_TO_CHANGE
# endif
}
- if( p_intf->p_sys )
- {
- free( p_intf->p_sys );
- p_intf->p_sys = NULL;
- }
+ free( p_intf->p_sys );
+ p_intf->p_sys = NULL;
#endif
}
*****************************************************************************/
static void Execute( intf_thread_t *p_this, const char *const *ppsz_args )
{
- pid_t pid;
- switch( pid = fork() )
+ pid_t pid = fork();
+ switch( pid )
{
case 0: /* we're the child */
+ {
+ sigset_t set;
+ sigemptyset (&set);
+ pthread_sigmask (SIG_SETMASK, &set, NULL);
+
/* We don't want output */
- freopen( "/dev/null", "w", stdout );
- freopen( "/dev/null", "w", stderr );
- execv( ppsz_args[0] , (char *const *)ppsz_args );
+ if( ( freopen( "/dev/null", "w", stdout ) != NULL )
+ && ( freopen( "/dev/null", "w", stderr ) != NULL ) )
+ execv( ppsz_args[0] , (char *const *)ppsz_args );
/* If the file we want to execute doesn't exist we exit() */
- exit( 1 );
- break;
+ exit( EXIT_FAILURE );
+ }
case -1: /* we're the error */
msg_Dbg( p_this, "Couldn't fork() while launching %s",
ppsz_args[0] );
*****************************************************************************/
static void Run( intf_thread_t *p_intf )
{
+ vlc_object_lock( p_intf );
+
#ifdef HAVE_DBUS
p_intf->p_sys->p_connection = dbus_init( p_intf );
#endif
- vlc_object_lock( p_intf );
- for(;;)
+ while( vlc_object_alive( p_intf ) )
{
vlc_object_t *p_vout;
/* Check screensaver every 30 seconds */
if( vlc_object_timedwait( p_intf, mdate() + 30000000 ) < 0 )
- break;
+ continue;
p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );