Remove useless test before free and delete.

[vlc] / modules / misc / screensaver.c

diff --git a/modules/misc/screensaver.c b/modules/misc/screensaver.c
index 95ab05d266138394b42c64b01e4c0be8411a881e..c090831428017b33d31925b6e1fd87df3538f156 100644 (file)
--- a/modules/misc/screensaver.c
+++ b/modules/misc/screensaver.c
@@ -26,12 +26,24 @@
  * Preamble
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_input.h>
 #include <vlc_interface.h>
 #include <vlc_aout.h>
 #include <vlc_vout.h>
 
+#include <sys/types.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
@@ -117,14 +129,43 @@ static void Deactivate( vlc_object_t *p_this )
 #  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
 }
 
+/*****************************************************************************
+ * Execute: Spawns a process using execv()
+ *****************************************************************************/
+static void Execute( intf_thread_t *p_this, const char *const *ppsz_args )
+{
+    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 */
+            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( EXIT_FAILURE );
+        }
+        case -1:    /* we're the error */
+            msg_Dbg( p_this, "Couldn't fork() while launching %s",
+                     ppsz_args[0] );
+            break;
+        default:    /* we're the parent */
+            /* Wait for the child to exit.
+             * We will not deadlock because we ran "/bin/sh &" */
+            while( waitpid( pid, NULL, 0 ) != pid);
+            break;
+    }
+}
 
 /*****************************************************************************
  * Run: main thread
@@ -134,13 +175,20 @@ static void Deactivate( vlc_object_t *p_this )
  *****************************************************************************/
 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
 
-    do
+    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 )
+            continue;
+
         p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
 
         /* If there is a video output, disable xscreensaver */
@@ -154,7 +202,9 @@ static void Run( intf_thread_t *p_intf )
                 if( PLAYING_S == p_input->i_state )
                 {
                     /* http://www.jwz.org/xscreensaver/faq.html#dvd */
-                    system( "xscreensaver-command -deactivate >&- 2>&- &" );
+                    const char *const ppsz_xsargs[] = { "/bin/sh", "-c",
+                            "xscreensaver-command -deactivate &", (char*)NULL };
+                    Execute( p_intf, ppsz_xsargs );
 
                     /* If we have dbus support, let's communicate directly
                        with gnome-screensave else, run
@@ -162,22 +212,17 @@ static void Run( intf_thread_t *p_intf )
 #ifdef HAVE_DBUS
                     poke_screensaver( p_intf, p_intf->p_sys->p_connection );
 #else
-                    system( "gnome-screensaver-command --poke >&- 2>&- &" );
+                    const char *const ppsz_gsargs[] = { "/bin/sh", "-c",
+                            "gnome-screensaver-command --poke &", (char*)NULL };
+                    Execute( p_intf, ppsz_gsargs );
 #endif
                     /* FIXME: add support for other screensavers */
                 }
                 vlc_object_release( p_input );
             }
         }
-
-        /* Check screensaver every 30 seconds */
-        vlc_mutex_lock( &p_intf->object_lock );
-        vlc_cond_timedwait( &p_intf->object_wait, &p_intf->object_lock,
-                            mdate() + 30000000 );
     }
-    while( !p_intf->b_die );
-
-    vlc_mutex_unlock( &p_intf->object_lock );
+    vlc_object_unlock( p_intf );
 }
 
 #ifdef HAVE_DBUS