[src/trunk]: src/external/bsd/blacklist more portability

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/16c380cf2a79
branches:  trunk
changeset: 335717:16c380cf2a79
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jan 22 03:10:49 2015 +0000

description:
more portability

diffstat:

 external/bsd/blacklist/bin/blacklistctl.c       |  7 +++----
 external/bsd/blacklist/bin/blacklistd.c         |  5 ++---
 external/bsd/blacklist/bin/conf.c               |  6 +++---
 external/bsd/blacklist/bin/internal.c           |  5 ++---
 external/bsd/blacklist/bin/run.c                |  5 ++---
 external/bsd/blacklist/bin/state.c              |  5 ++---
 external/bsd/blacklist/bin/support.c            |  5 ++---
 external/bsd/blacklist/lib/bl.c                 |  6 ++----
 external/bsd/blacklist/lib/blacklist.c          |  5 ++---
 external/bsd/blacklist/port/clock_gettime.c     |  2 +-
 external/bsd/blacklist/port/getprogname.c       |  1 -
 external/bsd/blacklist/port/popenve.c           |  5 ++---
 external/bsd/blacklist/port/sockaddr_snprintf.c |  6 +++---
 external/bsd/blacklist/port/strtoi.c            |  6 ++----
 14 files changed, 28 insertions(+), 41 deletions(-)

diffs (truncated from 305 to 300 lines):

diff -r bc9040e14dce -r 16c380cf2a79 external/bsd/blacklist/bin/blacklistctl.c
--- a/external/bsd/blacklist/bin/blacklistctl.c Thu Jan 22 03:08:09 2015 +0000
+++ b/external/bsd/blacklist/bin/blacklistctl.c Thu Jan 22 03:10:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: blacklistctl.c,v 1.6 2015/01/22 03:08:09 christos Exp $        */
+/*     $NetBSD: blacklistctl.c,v 1.7 2015/01/22 03:10:49 christos Exp $        */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,11 +30,10 @@
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "port.h"
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: blacklistctl.c,v 1.6 2015/01/22 03:08:09 christos Exp $");
+__RCSID("$NetBSD: blacklistctl.c,v 1.7 2015/01/22 03:10:49 christos Exp $");
 
 #include <stdio.h>
 #include <time.h>
@@ -51,7 +50,7 @@
 #include "conf.h"
 #include "state.h"
 #include "internal.h"
-#include "util.h"
+#include "support.h"
 
 static __dead void
 usage(int c)
diff -r bc9040e14dce -r 16c380cf2a79 external/bsd/blacklist/bin/blacklistd.c
--- a/external/bsd/blacklist/bin/blacklistd.c   Thu Jan 22 03:08:09 2015 +0000
+++ b/external/bsd/blacklist/bin/blacklistd.c   Thu Jan 22 03:10:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: blacklistd.c,v 1.13 2015/01/22 03:08:09 christos Exp $ */
+/*     $NetBSD: blacklistd.c,v 1.14 2015/01/22 03:10:49 christos Exp $ */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,10 +30,9 @@
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "port.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: blacklistd.c,v 1.13 2015/01/22 03:08:09 christos Exp $");
+__RCSID("$NetBSD: blacklistd.c,v 1.14 2015/01/22 03:10:49 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff -r bc9040e14dce -r 16c380cf2a79 external/bsd/blacklist/bin/conf.c
--- a/external/bsd/blacklist/bin/conf.c Thu Jan 22 03:08:09 2015 +0000
+++ b/external/bsd/blacklist/bin/conf.c Thu Jan 22 03:10:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.c,v 1.9 2015/01/22 03:08:09 christos Exp $        */
+/*     $NetBSD: conf.c,v 1.10 2015/01/22 03:10:49 christos Exp $       */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,10 +30,10 @@
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "port.h"
 #endif
+
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: conf.c,v 1.9 2015/01/22 03:08:09 christos Exp $");
+__RCSID("$NetBSD: conf.c,v 1.10 2015/01/22 03:10:49 christos Exp $");
 
 #include <stdio.h>
 #include <string.h>
diff -r bc9040e14dce -r 16c380cf2a79 external/bsd/blacklist/bin/internal.c
--- a/external/bsd/blacklist/bin/internal.c     Thu Jan 22 03:08:09 2015 +0000
+++ b/external/bsd/blacklist/bin/internal.c     Thu Jan 22 03:10:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: internal.c,v 1.2 2015/01/22 03:08:09 christos Exp $    */
+/*     $NetBSD: internal.c,v 1.3 2015/01/22 03:10:49 christos Exp $    */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,11 +30,10 @@
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "port.h"
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: internal.c,v 1.2 2015/01/22 03:08:09 christos Exp $");
+__RCSID("$NetBSD: internal.c,v 1.3 2015/01/22 03:10:49 christos Exp $");
 
 #include <stdio.h>
 #include <syslog.h>
diff -r bc9040e14dce -r 16c380cf2a79 external/bsd/blacklist/bin/run.c
--- a/external/bsd/blacklist/bin/run.c  Thu Jan 22 03:08:09 2015 +0000
+++ b/external/bsd/blacklist/bin/run.c  Thu Jan 22 03:10:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: run.c,v 1.6 2015/01/22 03:08:09 christos Exp $ */
+/*     $NetBSD: run.c,v 1.7 2015/01/22 03:10:49 christos Exp $ */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,11 +30,10 @@
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "port.h"
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: run.c,v 1.6 2015/01/22 03:08:09 christos Exp $");
+__RCSID("$NetBSD: run.c,v 1.7 2015/01/22 03:10:49 christos Exp $");
 
 #include <stdio.h>
 #ifdef HAVE_UTIL_H
diff -r bc9040e14dce -r 16c380cf2a79 external/bsd/blacklist/bin/state.c
--- a/external/bsd/blacklist/bin/state.c        Thu Jan 22 03:08:09 2015 +0000
+++ b/external/bsd/blacklist/bin/state.c        Thu Jan 22 03:10:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: state.c,v 1.6 2015/01/22 01:39:18 christos Exp $       */
+/*     $NetBSD: state.c,v 1.7 2015/01/22 03:10:49 christos Exp $       */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,11 +30,10 @@
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "port.h"
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: state.c,v 1.6 2015/01/22 01:39:18 christos Exp $");
+__RCSID("$NetBSD: state.c,v 1.7 2015/01/22 03:10:49 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff -r bc9040e14dce -r 16c380cf2a79 external/bsd/blacklist/bin/support.c
--- a/external/bsd/blacklist/bin/support.c      Thu Jan 22 03:08:09 2015 +0000
+++ b/external/bsd/blacklist/bin/support.c      Thu Jan 22 03:10:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: support.c,v 1.1 2015/01/22 03:08:09 christos Exp $     */
+/*     $NetBSD: support.c,v 1.2 2015/01/22 03:10:49 christos Exp $     */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,11 +30,10 @@
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "port.h"
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: support.c,v 1.1 2015/01/22 03:08:09 christos Exp $");
+__RCSID("$NetBSD: support.c,v 1.2 2015/01/22 03:10:49 christos Exp $");
 
 #include <time.h>
 #include <string.h>
diff -r bc9040e14dce -r 16c380cf2a79 external/bsd/blacklist/lib/bl.c
--- a/external/bsd/blacklist/lib/bl.c   Thu Jan 22 03:08:09 2015 +0000
+++ b/external/bsd/blacklist/lib/bl.c   Thu Jan 22 03:10:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bl.c,v 1.11 2015/01/22 02:48:24 christos Exp $ */
+/*     $NetBSD: bl.c,v 1.12 2015/01/22 03:10:49 christos Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -28,14 +28,12 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "port.h"
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: bl.c,v 1.11 2015/01/22 02:48:24 christos Exp $");
+__RCSID("$NetBSD: bl.c,v 1.12 2015/01/22 03:10:49 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff -r bc9040e14dce -r 16c380cf2a79 external/bsd/blacklist/lib/blacklist.c
--- a/external/bsd/blacklist/lib/blacklist.c    Thu Jan 22 03:08:09 2015 +0000
+++ b/external/bsd/blacklist/lib/blacklist.c    Thu Jan 22 03:10:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: blacklist.c,v 1.2 2015/01/22 02:42:56 christos Exp $   */
+/*     $NetBSD: blacklist.c,v 1.3 2015/01/22 03:10:49 christos Exp $   */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,11 +30,10 @@
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "port.h"
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: blacklist.c,v 1.2 2015/01/22 02:42:56 christos Exp $");
+__RCSID("$NetBSD: blacklist.c,v 1.3 2015/01/22 03:10:49 christos Exp $");
 
 #include <stdio.h>
 #include <bl.h>
diff -r bc9040e14dce -r 16c380cf2a79 external/bsd/blacklist/port/clock_gettime.c
--- a/external/bsd/blacklist/port/clock_gettime.c       Thu Jan 22 03:08:09 2015 +0000
+++ b/external/bsd/blacklist/port/clock_gettime.c       Thu Jan 22 03:10:49 2015 +0000
@@ -1,7 +1,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "port.h"
+
 #include <time.h>
 #include <sys/time.h>
 
diff -r bc9040e14dce -r 16c380cf2a79 external/bsd/blacklist/port/getprogname.c
--- a/external/bsd/blacklist/port/getprogname.c Thu Jan 22 03:08:09 2015 +0000
+++ b/external/bsd/blacklist/port/getprogname.c Thu Jan 22 03:10:49 2015 +0000
@@ -1,7 +1,6 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "port.h"
 
 extern char *__progname;
 
diff -r bc9040e14dce -r 16c380cf2a79 external/bsd/blacklist/port/popenve.c
--- a/external/bsd/blacklist/port/popenve.c     Thu Jan 22 03:08:09 2015 +0000
+++ b/external/bsd/blacklist/port/popenve.c     Thu Jan 22 03:10:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: popenve.c,v 1.1 2015/01/22 01:39:18 christos Exp $     */
+/*     $NetBSD: popenve.c,v 1.2 2015/01/22 03:10:50 christos Exp $     */
 
 /*
  * Copyright (c) 1988, 1993
@@ -35,14 +35,13 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "port.h"
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)popen.c    8.3 (Berkeley) 5/3/95";
 #else
-__RCSID("$NetBSD: popenve.c,v 1.1 2015/01/22 01:39:18 christos Exp $");
+__RCSID("$NetBSD: popenve.c,v 1.2 2015/01/22 03:10:50 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff -r bc9040e14dce -r 16c380cf2a79 external/bsd/blacklist/port/sockaddr_snprintf.c
--- a/external/bsd/blacklist/port/sockaddr_snprintf.c   Thu Jan 22 03:08:09 2015 +0000
+++ b/external/bsd/blacklist/port/sockaddr_snprintf.c   Thu Jan 22 03:10:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sockaddr_snprintf.c,v 1.6 2015/01/22 03:08:09 christos Exp $   */
+/*     $NetBSD: sockaddr_snprintf.c,v 1.7 2015/01/22 03:10:50 christos Exp $   */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,11 +30,11 @@
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#include "port.h"
 #endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.6 2015/01/22 03:08:09 christos Exp $");
+__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.7 2015/01/22 03:10:50 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff -r bc9040e14dce -r 16c380cf2a79 external/bsd/blacklist/port/strtoi.c
--- a/external/bsd/blacklist/port/strtoi.c      Thu Jan 22 03:08:09 2015 +0000
+++ b/external/bsd/blacklist/port/strtoi.c      Thu Jan 22 03:10:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: strtoi.c,v 1.2 2015/01/22 02:35:44 christos Exp $      */
+/*     $NetBSD: strtoi.c,v 1.3 2015/01/22 03:10:50 christos Exp $      */
 
 /*-
  * Copyright (c) 2005 The DragonFly Project.  All rights reserved.
@@ -29,14 +29,12 @@
  * Created by Kamil Rytarowski, based on ID:
  * NetBSD: src/common/lib/libc/stdlib/strtoul.c,v 1.3 2008/08/20 19:58:34 oster Exp
  */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "port.h"
 
 #include <sys/cdefs.h>