diff options
Diffstat (limited to 'lib/libc')
-rw-r--r-- | lib/libc/ssp/h_memset.c | 6 | ||||
-rw-r--r-- | lib/libc/ssp/h_read.c | 15 | ||||
-rw-r--r-- | lib/libc/sys/t_mmap.c | 6 | ||||
-rw-r--r-- | lib/libc/sys/t_timer_create.c | 4 |
4 files changed, 19 insertions, 12 deletions
diff --git a/lib/libc/ssp/h_memset.c b/lib/libc/ssp/h_memset.c index 65ed5f2ee7d2e..f1acbbd4e3117 100644 --- a/lib/libc/ssp/h_memset.c +++ b/lib/libc/ssp/h_memset.c @@ -1,4 +1,4 @@ -/* $NetBSD: h_memset.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */ +/* $NetBSD: h_memset.c,v 1.2 2017/01/16 16:34:24 christos Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ #include <sys/cdefs.h> __COPYRIGHT("@(#) Copyright (c) 2008\ The NetBSD Foundation, inc. All rights reserved."); -__RCSID("$NetBSD: h_memset.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $"); +__RCSID("$NetBSD: h_memset.c,v 1.2 2017/01/16 16:34:24 christos Exp $"); #include <stdio.h> #include <string.h> @@ -41,5 +41,5 @@ main(int argc, char *argv[]) char b[10]; size_t len = atoi(argv[1]); (void)memset(b, 0, len); - return 0; + return b[0]; /* keeps optimizer from zapping the call to memset() */ } diff --git a/lib/libc/ssp/h_read.c b/lib/libc/ssp/h_read.c index 5240af291eb7b..046ac62199b8d 100644 --- a/lib/libc/ssp/h_read.c +++ b/lib/libc/ssp/h_read.c @@ -1,4 +1,4 @@ -/* $NetBSD: h_read.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $ */ +/* $NetBSD: h_read.c,v 1.2 2017/01/16 16:35:57 christos Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -29,9 +29,11 @@ #include <sys/cdefs.h> __COPYRIGHT("@(#) Copyright (c) 2008\ The NetBSD Foundation, inc. All rights reserved."); -__RCSID("$NetBSD: h_read.c,v 1.1 2010/12/27 02:04:19 pgoyette Exp $"); +__RCSID("$NetBSD: h_read.c,v 1.2 2017/01/16 16:35:57 christos Exp $"); #include <sys/param.h> +#include <fcntl.h> +#include <paths.h> #include <stdio.h> #include <unistd.h> #include <stdlib.h> @@ -40,8 +42,13 @@ int main(int argc, char *argv[]) { char b[MAXPATHLEN]; + int fd, n; size_t len = atoi(argv[1]); - (void)read(0, b, len); + + if ((fd = open(_PATH_DEVZERO, O_RDONLY)) == -1) + abort(); + if ((n = read(fd, b, len)) == -1) + abort(); (void)printf("%s\n", b); - return 0; + return (0); } diff --git a/lib/libc/sys/t_mmap.c b/lib/libc/sys/t_mmap.c index 3dc1e7f92fe3b..f01ed76315b5d 100644 --- a/lib/libc/sys/t_mmap.c +++ b/lib/libc/sys/t_mmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: t_mmap.c,v 1.11 2017/01/13 20:43:11 christos Exp $ */ +/* $NetBSD: t_mmap.c,v 1.12 2017/01/16 16:31:05 christos Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -55,9 +55,10 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__RCSID("$NetBSD: t_mmap.c,v 1.11 2017/01/13 20:43:11 christos Exp $"); +__RCSID("$NetBSD: t_mmap.c,v 1.12 2017/01/16 16:31:05 christos Exp $"); #include <sys/param.h> +#include <sys/disklabel.h> #include <sys/mman.h> #include <sys/stat.h> #include <sys/socket.h> @@ -73,7 +74,6 @@ __RCSID("$NetBSD: t_mmap.c,v 1.11 2017/01/13 20:43:11 christos Exp $"); #include <string.h> #include <unistd.h> #include <paths.h> -#include <machine/disklabel.h> static long page = 0; static char path[] = "mmap"; diff --git a/lib/libc/sys/t_timer_create.c b/lib/libc/sys/t_timer_create.c index ce1fb99eb1ad1..e8a6acd08efc4 100644 --- a/lib/libc/sys/t_timer_create.c +++ b/lib/libc/sys/t_timer_create.c @@ -1,4 +1,4 @@ -/* $NetBSD: t_timer_create.c,v 1.4 2012/03/18 07:00:52 jruoho Exp $ */ +/* $NetBSD: t_timer_create.c,v 1.5 2017/01/16 16:32:13 christos Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ static timer_t t; static bool fail = true; static void -timer_signal_handler(int signo, siginfo_t *si, void *osi) +timer_signal_handler(int signo, siginfo_t *si, void *osi __unused) { timer_t *tp; |