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

portability fixes.

Browse Source
This commit is contained in:
christos 2015-01-22 02:42:56 +00:00
parent 8b81106e1d
commit 8c8c9103ca
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: bl.c,v 1.9 2015/01/22 01:39:18 christos Exp $ */ /* $NetBSD: bl.c,v 1.10 2015/01/22 02:42:56 christos Exp $ */
/*- /*-
* Copyright (c) 2014 The NetBSD Foundation, Inc. * Copyright (c) 2014 The NetBSD Foundation, Inc.
@ -28,8 +28,14 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "port.h"
#endif
#include <sys/cdefs.h> #include <sys/cdefs.h>
__RCSID("$NetBSD: bl.c,v 1.9 2015/01/22 01:39:18 christos Exp $"); __RCSID("$NetBSD: bl.c,v 1.10 2015/01/22 02:42:56 christos Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h> #include <sys/types.h>
@ -43,6 +49,7 @@ __RCSID("$NetBSD: bl.c,v 1.9 2015/01/22 01:39:18 christos Exp $");
#include <fcntl.h> #include <fcntl.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "bl.h" #include "bl.h"
@ -93,7 +100,9 @@ bl_init(bl_t b, bool srv)
/* AF_UNIX address of local logger */ /* AF_UNIX address of local logger */
struct sockaddr_un sun = { struct sockaddr_un sun = {
.sun_family = AF_LOCAL, .sun_family = AF_LOCAL,
#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
.sun_len = sizeof(sun), .sun_len = sizeof(sun),
#endif
}; };
mode_t om; mode_t om;
int rv; int rv;
@ -127,8 +136,10 @@ bl_init(bl_t b, bool srv)
fcntl(b->b_fd, F_SETFL, fcntl(b->b_fd, F_GETFL) | O_NONBLOCK); fcntl(b->b_fd, F_SETFL, fcntl(b->b_fd, F_GETFL) | O_NONBLOCK);
#endif #endif
#if SOCK_NOSIGPIPE == 0 #if SOCK_NOSIGPIPE == 0
#ifdef SO_NOSIGPIPE
int o = 1; 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)
#endif
#endif #endif
} }
@ -271,7 +282,6 @@ bl_recv(bl_t b)
bl_message_t bl; bl_message_t bl;
char buf[512]; char buf[512];
} ub; } ub;
int *fd;
ssize_t rlen; ssize_t rlen;
bl_info_t *bi = &b->b_info; bl_info_t *bi = &b->b_info;
@ -309,6 +319,7 @@ bl_recv(bl_t b)
} }
memcpy(&bi->bi_fd, CMSG_DATA(cmsg), sizeof(bi->bi_fd)); memcpy(&bi->bi_fd, CMSG_DATA(cmsg), sizeof(bi->bi_fd));
break; break;
#ifdef SCM_CREDS
case SCM_CREDS: case SCM_CREDS:
#ifdef SOCKCREDSIZE #ifdef SOCKCREDSIZE
sc = (void *)CMSG_DATA(cmsg); sc = (void *)CMSG_DATA(cmsg);
@ -316,6 +327,7 @@ bl_recv(bl_t b)
#else #else
#endif #endif
break; break;
#endif
default: default:
(*b->b_fun)(LOG_ERR, "%s: unexpected cmsg_type %d", (*b->b_fun)(LOG_ERR, "%s: unexpected cmsg_type %d",
__func__, cmsg->cmsg_type); __func__, cmsg->cmsg_type);

11
external/bsd/blacklist/lib/blacklist.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: blacklist.c,v 1.1 2015/01/21 16:16:00 christos Exp $ */ /* $NetBSD: blacklist.c,v 1.2 2015/01/22 02:42:56 christos Exp $ */
/*- /*-
* Copyright (c) 2014 The NetBSD Foundation, Inc. * Copyright (c) 2014 The NetBSD Foundation, Inc.
@ -28,8 +28,13 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#include "port.h"
#endif
#include <sys/cdefs.h> #include <sys/cdefs.h>
__RCSID("$NetBSD: blacklist.c,v 1.1 2015/01/21 16:16:00 christos Exp $"); __RCSID("$NetBSD: blacklist.c,v 1.2 2015/01/22 02:42:56 christos Exp $");
#include <stdio.h> #include <stdio.h>
#include <bl.h> #include <bl.h>
@ -59,7 +64,7 @@ expandm(char *buf, size_t len, const char *fmt)
} }
static void static void
dlog(int level, const char *fmt, ...) dlog(int level __unused, const char *fmt, ...)
{ {
char buf[BUFSIZ]; char buf[BUFSIZ];
va_list ap; va_list ap;