Changeset ff924dbc0fa20c7631c2a07af0a1c36d571a5e71

Timestamp:

30/06/06 18:34:46 (2 years ago)

Author:

Pavlov Konstantin <thresh@videolan.org>

git-committer:

Pavlov Konstantin <thresh@videolan.org> 1151685286 +0000

git-parent:

[d17c2e5f50a30c7f73821a70e7a0f8ae0b495e9d]

git-author:

Pavlov Konstantin <thresh@videolan.org> 1151685286 +0000

Message:

support for creating pid files when going daemon mode.
Someone should really review it as it is my first experience in C.

Files:

• include/main.h (modified) (1 diff)
• src/libvlc.c (modified) (1 diff)
• src/libvlc.h (modified) (2 diffs)

include/main.h

@@ -93 +93 @@
-    char *                 psz_userdir;             /* user's home directory */
-    char *                 psz_configfile;        /* location of config file */
+    char *                 psz_pidfile;
-
-    /* Fast memcpy plugin used */

src/libvlc.c

@@ -419 +419 @@
-
-        p_vlc->p_libvlc->b_daemon = VLC_TRUE;
+
+        /* lets check if we need to write the pidfile */
+        p_vlc->psz_pidfile = config_GetPsz( p_vlc, "pidfile" );
+
+        msg_Dbg( p_vlc, "p_vlc->psz_pidfile is %s", p_vlc->psz_pidfile );
+
+        if( p_vlc->psz_pidfile != NULL )
+        {
+            pid_t i_pid;
+            FILE *pidfile;
+            
+            i_pid = getpid();
+
+            msg_Dbg( p_vlc, "our PID is %d, writing it to %s", i_pid, p_vlc->psz_pidfile );
+            
+            pidfile = utf8_fopen( p_vlc->psz_pidfile,"w" );
+            if( pidfile != NULL )
+            {
+                utf8_fprintf( pidfile, "%d", (int)i_pid );
+                fclose( pidfile );
+            }
+            else
+            {
+                msg_Err( p_vlc, "Cannot open pid file for writing: %s, error: %s", p_vlc->psz_pidfile, strerror(errno) );
+            }
+        }
-
-#else

src/libvlc.h

@@ -835 +835 @@
-#define DAEMON_LONGTEXT N_( \
-     "Runs VLC as a background daemon process.")
+
+#define PIDFILE_TEXT N_("Write process id to file")
+#define PIDFILE_LONGTEXT N_( \
+       "Writes proccess id into specified file.")
-
-#define FILE_LOG_TEXT N_( "Log to file" )
@@ -1592 +1596 @@
-    add_bool( "daemon", 0, NULL, DAEMON_TEXT, DAEMON_LONGTEXT, VLC_TRUE );
-        change_short('d');
+
+    add_string( "pidfile", NULL, NULL, PIDFILE_TEXT, PIDFILE_LONGTEXT,
+                                       VLC_FALSE );
-#endif
-