summaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2009-05-18 22:27:42 +0000
committerdelphij <delphij@FreeBSD.org>2009-05-18 22:27:42 +0000
commit862d9405b857dba35f8f2eb6d0623b9a552d4353 (patch)
treec176aed40df9d569e6997b325eceec4cbf609fb7 /file.c
parent00d8dd21dbcbead074383f1483d0ade146f266d9 (diff)
downloadFreeBSD-src-862d9405b857dba35f8f2eb6d0623b9a552d4353.zip
FreeBSD-src-862d9405b857dba35f8f2eb6d0623b9a552d4353.tar.gz
Virgin import of Christos Zoulas's FILE 5.03.
Security: CVE-2009-1515
Diffstat (limited to 'file.c')
-rw-r--r--file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/file.c b/file.c
index 9b4747b..34aa44c 100644
--- a/file.c
+++ b/file.c
@@ -32,7 +32,7 @@
#include "file.h"
#ifndef lint
-FILE_RCSID("@(#)$File: file.c,v 1.130 2009/02/03 20:27:51 christos Exp $")
+FILE_RCSID("@(#)$File: file.c,v 1.131 2009/02/13 18:48:05 christos Exp $")
#endif /* lint */
#include "magic.h"
@@ -61,7 +61,7 @@ FILE_RCSID("@(#)$File: file.c,v 1.130 2009/02/03 20:27:51 christos Exp $")
#include <wchar.h>
#endif
-#ifdef HAVE_GETOPT_H
+#if defined(HAVE_GETOPT_H) && defined(HAVE_STRUCT_OPTION)
#include <getopt.h>
#else
#include "mygetopt.h"
OpenPOWER on IntegriCloud