X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fsetproctitle.c;h=e6f0941641749119761fe831b09b09767cc8a796;hb=468519681b09f00851e1d4dd658b939e4e938cf6;hp=819f7b0e7127b7f056bef7d806908ca4a2a076aa;hpb=5dcd0f6ff8458786206bace673263bcc04b53edf;p=catta diff --git a/avahi-daemon/setproctitle.c b/avahi-daemon/setproctitle.c index 819f7b0..e6f0941 100644 --- a/avahi-daemon/setproctitle.c +++ b/avahi-daemon/setproctitle.c @@ -1,18 +1,16 @@ -/* $Id$ */ - /*** This file is part of avahi. - + avahi is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + avahi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with avahi; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -29,6 +27,10 @@ #include #include +#ifdef HAVE_SYS_PRCTL_H +#include +#endif + #include #include "setproctitle.h" @@ -62,7 +64,7 @@ void avahi_init_proc_title(int argc, char **argv) { argv_size = endptr - argv_buffer[0]; /* Make a copy of environ */ - + new_environ = avahi_malloc(sizeof(char*) * (i + 1)); for (i = 0; environ[i]; i++) new_environ[i] = avahi_strdup(environ[i]); @@ -71,32 +73,39 @@ void avahi_init_proc_title(int argc, char **argv) { environ = new_environ; #endif -} +} -void avahi_set_proc_title(const char *fmt,...) { +void avahi_set_proc_title(const char *name, const char *fmt,...) { #ifdef HAVE_SETPROCTITLE char t[256]; va_list ap; - va_start(ap); + va_start(ap, fmt); vsnprintf(t, sizeof(t), fmt, ap); va_end(ap); setproctitle("-%s", t); -#elif __linux__ +#elif defined(__linux__) size_t l; va_list ap; - + if (!argv_buffer) return; - + va_start(ap, fmt); vsnprintf(argv_buffer[0], argv_size, fmt, ap); va_end(ap); l = strlen(argv_buffer[0]); - + memset(argv_buffer[0] + l, 0, argv_size - l); argv_buffer[1] = NULL; #endif + +#if defined(HAVE_SYS_PRCTL_H) && defined(PR_SET_NAME) + + if (name) + prctl(PR_SET_NAME, (unsigned long) name, 0, 0, 0); + +#endif }