Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more portability

Browse Source
This commit is contained in:
christos 2015-01-22 02:48:24 +00:00
parent ba56bb9d7f
commit 1e27449070
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
external/bsd/blacklist/lib/bl.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: bl.c,v 1.10 2015/01/22 02:42:56 christos Exp $ */
/* $NetBSD: bl.c,v 1.11 2015/01/22 02:48:24 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@ -35,7 +35,7 @@
#endif
#include <sys/cdefs.h>
__RCSID("$NetBSD: bl.c,v 1.10 2015/01/22 02:42:56 christos Exp $");
__RCSID("$NetBSD: bl.c,v 1.11 2015/01/22 02:48:24 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@ -46,6 +46,7 @@ __RCSID("$NetBSD: bl.c,v 1.10 2015/01/22 02:42:56 christos Exp $");
#include <stdio.h>
#include <string.h>
#include <syslog.h>
#include <signal.h>
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
@ -138,7 +139,9 @@ bl_init(bl_t b, bool srv)
#if SOCK_NOSIGPIPE == 0
#ifdef SO_NOSIGPIPE
int o = 1;
setsockopt(b->b_fd, SOL_SOCKET, SO_NOSIGPIPE, &o, sizeof(o)
setsockopt(b->b_fd, SOL_SOCKET, SO_NOSIGPIPE, &o, sizeof(o));
#else
signal(SIGPIPE, SIG_IGN);
#endif
#endif
}

11
external/bsd/blacklist/port/sockaddr_snprintf.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: sockaddr_snprintf.c,v 1.4 2015/01/22 02:45:10 christos Exp $ */
/* $NetBSD: sockaddr_snprintf.c,v 1.5 2015/01/22 02:48:24 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.4 2015/01/22 02:45:10 christos Exp $");
__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.5 2015/01/22 02:48:24 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@ -43,6 +43,9 @@ __RCSID("$NetBSD: sockaddr_snprintf.c,v 1.4 2015/01/22 02:45:10 christos Exp $")
#include <sys/un.h>
#include <netinet/in.h>
#ifdef __linux__
#undef HAVE_NETATALK_AT_H
#endif
#ifdef HAVE_NETATALK_AT_H
#include <netatalk/at.h>
#endif
@ -208,6 +211,7 @@ sockaddr_snprintf(char * const sbuf, const size_t len, const char * const fmt,
p = ntohs(sin6->sin6_port);
a = &sin6->sin6_addr;
break;
#ifdef HAVE_NET_IF_DL_H
case AF_LINK:
sdl = ((const struct sockaddr_dl *)(const void *)sa);
(void)strlcpy(addr = abuf, link_ntoa(sdl), sizeof(abuf));
@ -216,6 +220,7 @@ sockaddr_snprintf(char * const sbuf, const size_t len, const char * const fmt,
addr = w;
}
break;
#endif
default:
errno = EAFNOSUPPORT;
return -1;
@ -339,9 +344,11 @@ sockaddr_snprintf(char * const sbuf, const size_t len, const char * const fmt,
case AF_INET6:
debug_in6(nbuf, sizeof(nbuf), sin6);
break;
#ifdef NET_IF_DL_H
case AF_LINK:
debug_dl(nbuf, sizeof(nbuf), sdl);
break;
#endif
default:
abort();
}