diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-01-16 16:48:51 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-01-16 16:48:51 +0000 |
| commit | aea60bee5e9bad0aab62f480f19c2fb34c068de4 (patch) | |
| tree | 1e7befbc10e28796528939427d4fdbd94b60d9af /lib/libc/stdlib | |
| parent | More evil bootstrap code. #ifndef ALIGNBYTES #define ALIGNBYTES 3. (diff) | |
| download | wireguard-openbsd-aea60bee5e9bad0aab62f480f19c2fb34c068de4.tar.xz wireguard-openbsd-aea60bee5e9bad0aab62f480f19c2fb34c068de4.zip | |
Move to the <limits.h> universe.
review by millert, binary checking process with doug, concept with guenther
Diffstat (limited to 'lib/libc/stdlib')
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 4 | ||||
| -rw-r--r-- | lib/libc/stdlib/random.c | 5 | ||||
| -rw-r--r-- | lib/libc/stdlib/realpath.c | 6 |
3 files changed, 6 insertions, 9 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 57d35b80b6e..69ae877abac 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.172 2015/01/05 21:04:04 tedu Exp $ */ +/* $OpenBSD: malloc.c,v 1.173 2015/01/16 16:48:51 deraadt Exp $ */ /* * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net> * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> @@ -26,7 +26,7 @@ /* #define MALLOC_STATS */ #include <sys/types.h> -#include <sys/param.h> +#include <sys/param.h> /* PAGE_SHIFT ALIGN */ #include <sys/queue.h> #include <sys/mman.h> #include <sys/uio.h> diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c index 96cced9a204..e293648ecd3 100644 --- a/lib/libc/stdlib/random.c +++ b/lib/libc/stdlib/random.c @@ -1,4 +1,4 @@ -/* $OpenBSD: random.c,v 1.28 2014/12/16 20:51:32 sthen Exp $ */ +/* $OpenBSD: random.c,v 1.29 2015/01/16 16:48:51 deraadt Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. * All rights reserved. @@ -28,9 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/param.h> -#include <sys/sysctl.h> -#include <sys/time.h> #include <fcntl.h> #include <stdio.h> #include <stdlib.h> diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c index e06db59088f..7b70b9ddfb3 100644 --- a/lib/libc/stdlib/realpath.c +++ b/lib/libc/stdlib/realpath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: realpath.c,v 1.18 2014/10/19 03:56:28 doug Exp $ */ +/* $OpenBSD: realpath.c,v 1.19 2015/01/16 16:48:51 deraadt Exp $ */ /* * Copyright (c) 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru> * @@ -27,13 +27,13 @@ * SUCH DAMAGE. */ -#include <sys/param.h> #include <sys/stat.h> #include <errno.h> #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <limits.h> /* A slightly modified copy of this file exists in libexec/ld.so */ @@ -156,7 +156,7 @@ realpath(const char *path, char *resolved) goto err; } if (S_ISLNK(sb.st_mode)) { - if (symlinks++ > MAXSYMLINKS) { + if (symlinks++ > SYMLOOP_MAX) { errno = ELOOP; goto err; } |