Commit 3fed78e5b08f78256e533788b4bcd6502b0949d7
2010-01-10T00:37:03
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91
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. */
+}
+