diff options
Diffstat (limited to 'usr.bin/cdio')
| -rw-r--r-- | usr.bin/cdio/cddb.c | 6 | ||||
| -rw-r--r-- | usr.bin/cdio/cdio.c | 7 | ||||
| -rw-r--r-- | usr.bin/cdio/mmc.c | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/usr.bin/cdio/cddb.c b/usr.bin/cdio/cddb.c index bc3e010aab7..c5ae468db5a 100644 --- a/usr.bin/cdio/cddb.c +++ b/usr.bin/cdio/cddb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cddb.c,v 1.19 2014/01/06 12:38:10 espie Exp $ */ +/* $OpenBSD: cddb.c,v 1.20 2015/01/16 06:40:06 deraadt Exp $ */ /* * Copyright (c) 2002 Marc Espie. * @@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <sys/cdio.h> @@ -34,6 +33,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <limits.h> #include <vis.h> #include "extern.h" @@ -76,7 +76,7 @@ cddb_discid(int n, struct cd_toc_entry *e) void send_hello(FILE *cout) { - char hostname[MAXHOSTNAMELEN]; + char hostname[HOST_NAME_MAX+1]; if (gethostname(hostname, sizeof(hostname)) == -1) strlcpy(hostname, "unknown", sizeof hostname); diff --git a/usr.bin/cdio/cdio.c b/usr.bin/cdio/cdio.c index 4be37621b16..0177630da6e 100644 --- a/usr.bin/cdio/cdio.c +++ b/usr.bin/cdio/cdio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cdio.c,v 1.73 2013/11/20 20:54:34 deraadt Exp $ */ +/* $OpenBSD: cdio.c,v 1.74 2015/01/16 06:40:06 deraadt Exp $ */ /* Copyright (c) 1995 Serge V. Vakulenko * All rights reserved. @@ -52,7 +52,7 @@ * $FreeBSD: cdcontrol.c,v 1.13 1996/06/25 21:01:27 ache Exp $ */ -#include <sys/param.h> +#include <sys/param.h> /* isset */ #include <sys/file.h> #include <sys/cdio.h> #include <sys/ioctl.h> @@ -67,6 +67,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <limits.h> #include <histedit.h> #include <util.h> #include <vis.h> @@ -319,7 +320,7 @@ int run(int cmd, char *arg) { int l, r, rc; - static char newcdname[MAXPATHLEN]; + static char newcdname[PATH_MAX]; switch (cmd) { diff --git a/usr.bin/cdio/mmc.c b/usr.bin/cdio/mmc.c index d34f86f44f7..2866d805064 100644 --- a/usr.bin/cdio/mmc.c +++ b/usr.bin/cdio/mmc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mmc.c,v 1.29 2013/11/12 17:57:34 deraadt Exp $ */ +/* $OpenBSD: mmc.c,v 1.30 2015/01/16 06:40:06 deraadt Exp $ */ /* * Copyright (c) 2006 Michael Coulter <mjc@openbsd.org> * @@ -18,7 +18,7 @@ #include <sys/limits.h> #include <sys/types.h> #include <sys/scsiio.h> -#include <sys/param.h> +#include <sys/param.h> /* setbit, isset */ #include <scsi/cd.h> #include <scsi/scsi_all.h> #include <scsi/scsi_disk.h> |