New function make_pidfile_name().

The upcoming ofp-kill utility wants to use this.

diff --git a/include/daemon.h b/include/daemon.h
index 208cee9c7f1e8ade733fd88fb0d63ebc080adc23..d7273e02666a583c487905cff42db6f18f0185bf 100644 (file)
--- a/include/daemon.h
+++ b/include/daemon.h
@@ -34,6 +34,7 @@
 #ifndef DAEMON_H
 #define DAEMON_H 1
 
+char *make_pidfile_name(const char *name);
 void set_pidfile(const char *name);
 void set_detach(void);
 void daemonize(void);

diff --git a/lib/daemon.c b/lib/daemon.c
index b153dc0c1e51621010344d0b0b1ab1515bff680b..b5977172203d0a351c829f938119681a4c555003 100644 (file)
--- a/lib/daemon.c
+++ b/lib/daemon.c
@@ -50,6 +50,16 @@ static bool detach;
 /* Name of pidfile (null if none). */
 static char *pidfile;
 
+/* Returns the file name that would be used for a pidfile if 'name' were
+ * provided to set_pidfile().  The caller must free the returned string. */
+char *
+make_pidfile_name(const char *name) 
+{
+    return (!name ? xasprintf("%s/%s.pid", RUNDIR, program_name)
+            : *name == '/' ? xstrdup(name)
+            : xasprintf("%s/%s", RUNDIR, name));
+}
+
 /* Sets up a following call to daemonize() to create a pidfile named 'name'.
  * If 'name' begins with '/', then it is treated as an absolute path.
  * Otherwise, it is taken relative to RUNDIR, which is $(prefix)/var/run by
@@ -60,9 +70,7 @@ void
 set_pidfile(const char *name)
 {
     free(pidfile);
-    pidfile = (!name ? xasprintf("%s/%s.pid", RUNDIR, program_name)
-               : *name == '/' ? xstrdup(name)
-               : xasprintf("%s/%s", RUNDIR, name));
+    pidfile = make_pidfile_name(name);
 }
 
 /* Sets up a following call to daemonize() to detach from the foreground