Replace setproctitle dummy macro with a function stub

This way we can replace it later on with a real implementation so that
applications can immediately benefit from it w/o the need to recompile
them.

diff --git a/Makefile b/Makefile
index 2fea0b4c3456b2654e02d2329be2d5168984595a..830037c45b7c86202ce2ef83a6a4baeb82057c67 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,7 @@ LIB_SRCS := \
        pidfile.c \
        readpassphrase.c \
        setmode.c \
+       setproctitle.c \
        strmode.c \
        strtonum.c \
        strlcat.c strlcpy.c \

diff --git a/Versions b/Versions
index 631cd5db1c4b4c1dfb6f4ef089fb8754acfb2cb9..70bd8cf25516e94d1b9bcaf7aee238bc3ea22a48 100644 (file)
--- a/Versions
+++ b/Versions
@@ -58,5 +58,7 @@ LIBBSD_0.2 {
     pidfile_write;
     pidfile_close;
     pidfile_remove;
+
+    setproctitle;
 } LIBBSD_0.1;
 

diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h
index a0b7860001278772493629d9a4e298b0bf3fa49a..4d9aa4918011ac94b24d88e6a2f82b13bc78bc08 100644 (file)
--- a/include/bsd/sys/cdefs.h
+++ b/include/bsd/sys/cdefs.h
@@ -29,10 +29,6 @@
 
 #include <sys/cdefs.h>
 
-#ifndef setproctitle
-# define setproctitle(fmt, args...)
-#endif
-
 #ifndef __dead2
 # define __dead2
 #endif

diff --git a/include/bsd/unistd.h b/include/bsd/unistd.h
index 16855ece301762524708495ca98db5f649fc1ce4..f9f78748cea8a63ab54583bb91c918c507c2de02 100644 (file)
--- a/include/bsd/unistd.h
+++ b/include/bsd/unistd.h
@@ -37,6 +37,8 @@
 __BEGIN_DECLS
 mode_t getmode(const void *set, mode_t mode);
 void *setmode(const char *mode_str);
+
+void setproctitle(const char *fmt, ...);
 __END_DECLS
 
 #endif

diff --git a/src/setproctitle.c b/src/setproctitle.c
new file mode 100644 (file)
index 0000000..44768b2
--- /dev/null
+++ b/src/setproctitle.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2010 Guillem Jover
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+void
+setproctitle(const char *fmt, ...)
+{
+       /* Stub so that we can implement it later on and programs will
+        * automatically benefit from it, w/o needing to recompile. */
+}
+