summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@hadrons.org>2010-01-10 00:37:03 +0100
committerGuillem Jover <guillem@hadrons.org>2010-01-10 15:29:50 +0100
commit3fed78e5b08f78256e533788b4bcd6502b0949d7 (patch)
tree938fc23c9434fede8b15fb9bcfb2c0c4b017620b
parent2a81893cc028b40f7832bf033821a1aacfaaea68 (diff)
downloadlibbsd-3fed78e5b08f78256e533788b4bcd6502b0949d7.tar.gz
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.
-rw-r--r--Makefile1
-rw-r--r--Versions2
-rw-r--r--include/bsd/sys/cdefs.h4
-rw-r--r--include/bsd/unistd.h2
-rw-r--r--src/setproctitle.c33
5 files changed, 38 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 2fea0b4..830037c 100644
--- 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 631cd5d..70bd8cf 100644
--- 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 a0b7860..4d9aa49 100644
--- 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 16855ec..f9f7874 100644
--- 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
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. */
+}
+