Module Name: src
Committed By: christos
Date: Tue Apr 5 12:28:57 UTC 2016
Modified Files:
src/external/bsd/blacklist/port: pidfile.c port.h sockaddr_snprintf.c
Added Files:
src/external/bsd/blacklist/port: config.h
Log Message:
more FreeBSD changes from Kurt Lidl.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/blacklist/port/config.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/blacklist/port/pidfile.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/blacklist/port/port.h
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/blacklist/port/sockaddr_snprintf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/blacklist/port/pidfile.c
diff -u src/external/bsd/blacklist/port/pidfile.c:1.1 src/external/bsd/blacklist/port/pidfile.c:1.2
--- src/external/bsd/blacklist/port/pidfile.c:1.1 Thu Jan 22 11:19:53 2015
+++ src/external/bsd/blacklist/port/pidfile.c Tue Apr 5 08:28:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pidfile.c,v 1.1 2015/01/22 16:19:53 christos Exp $ */
+/* $NetBSD: pidfile.c,v 1.2 2016/04/05 12:28:57 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pidfile.c,v 1.1 2015/01/22 16:19:53 christos Exp $");
+__RCSID("$NetBSD: pidfile.c,v 1.2 2016/04/05 12:28:57 christos Exp $");
#endif
#include <sys/param.h>
@@ -45,6 +45,9 @@ __RCSID("$NetBSD: pidfile.c,v 1.1 2015/0
#include <stdio.h>
#include <string.h>
#include <unistd.h>
+#ifdef HAVE_LIBUTIL_H
+#include <libutil.h>
+#endif
#ifdef HAVE_UTIL_H
#include <util.h>
#endif
Index: src/external/bsd/blacklist/port/port.h
diff -u src/external/bsd/blacklist/port/port.h:1.7 src/external/bsd/blacklist/port/port.h:1.8
--- src/external/bsd/blacklist/port/port.h:1.7 Fri Mar 11 12:17:35 2016
+++ src/external/bsd/blacklist/port/port.h Tue Apr 5 08:28:57 2016
@@ -78,7 +78,9 @@ int clock_gettime(int, struct timespec *
#define CLOCK_REALTIME 0
#endif
+#if !defined(__FreeBSD__)
#define _PATH_BLCONF "conf"
#define _PATH_BLCONTROL "control"
#define _PATH_BLSOCK "blacklistd.sock"
#define _PATH_BLSTATE "blacklistd.db"
+#endif
Index: src/external/bsd/blacklist/port/sockaddr_snprintf.c
diff -u src/external/bsd/blacklist/port/sockaddr_snprintf.c:1.9 src/external/bsd/blacklist/port/sockaddr_snprintf.c:1.10
--- src/external/bsd/blacklist/port/sockaddr_snprintf.c:1.9 Thu Jan 22 22:29:18 2015
+++ src/external/bsd/blacklist/port/sockaddr_snprintf.c Tue Apr 5 08:28:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sockaddr_snprintf.c,v 1.9 2015/01/23 03:29:18 christos Exp $ */
+/* $NetBSD: sockaddr_snprintf.c,v 1.10 2016/04/05 12:28:57 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.9 2015/01/23 03:29:18 christos Exp $");
+__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.10 2016/04/05 12:28:57 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -57,6 +57,9 @@ __RCSID("$NetBSD: sockaddr_snprintf.c,v
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#ifdef HAVE_LIBUTIL_H
+#include <libutil.h>
+#endif
#ifdef HAVE_UTIL_H
#include <util.h>
#endif
Added files:
Index: src/external/bsd/blacklist/port/config.h
diff -u /dev/null src/external/bsd/blacklist/port/config.h:1.1
--- /dev/null Tue Apr 5 08:28:57 2016
+++ src/external/bsd/blacklist/port/config.h Tue Apr 5 08:28:57 2016
@@ -0,0 +1,4 @@
+#if defined(__FreeBSD__)
+#define HAVE_FPARSELN
+#include "port.h"
+#endif
