From 77b37936f7fa7e1632210bb1a661051473e7b303 Mon Sep 17 00:00:00 2001 From: millert Date: Fri, 16 Jan 2015 18:08:15 +0000 Subject: [PATCH] Add missing to file.c and remove definition of PATH_MAX which masked the missing include. OK deraadt@ --- usr.bin/file/apprentice.c | 6 +----- usr.bin/file/file.c | 7 ++----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/usr.bin/file/apprentice.c b/usr.bin/file/apprentice.c index 1c6a49e96e6..295c899abf4 100644 --- a/usr.bin/file/apprentice.c +++ b/usr.bin/file/apprentice.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apprentice.c,v 1.33 2015/01/16 08:24:04 doug Exp $ */ +/* $OpenBSD: apprentice.c,v 1.34 2015/01/16 18:08:15 millert Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. * Software written by Ian F. Darwin and others; @@ -73,10 +73,6 @@ #define MAP_FILE 0 #endif -#ifndef PATH_MAX -#define PATH_MAX 1024 -#endif - struct magic_entry { struct magic *mp; uint32_t cont_count; diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c index 310bce7b15d..fcd6c34cd5f 100644 --- a/usr.bin/file/file.c +++ b/usr.bin/file/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.25 2015/01/16 08:24:04 doug Exp $ */ +/* $OpenBSD: file.c,v 1.26 2015/01/16 18:08:15 millert Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. * Software written by Ian F. Darwin and others; @@ -39,6 +39,7 @@ #include #include #include +#include #include #ifdef RESTORE_TIME # if (__COHERENT__ >= 0x420) @@ -80,10 +81,6 @@ int getopt_long(int argc, char * const *argv, const char *optstring, const struc # define USAGE "Usage: %s [-bcik" SYMLINKFLAG "nNprsvz0] [-e test] [-f namefile] [-F separator] [-m magicfiles] file...\n" \ " %s -C -m magicfiles\n" -#ifndef PATH_MAX -#define PATH_MAX 1024 -#endif - private int /* Global command-line options */ bflag = 0, /* brief output format */ nopad = 0, /* Don't pad output */ -- 2.20.1