Module Name: src
Committed By: christos
Date: Sun Jan 17 15:32:38 UTC 2016
Modified Files:
src/usr.bin/make: arch.c job.c main.c make.h meta.c parse.c
Log Message:
provide missing FD_CLOEXEC for the havenots.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/usr.bin/make/arch.c
cvs rdiff -u -r1.183 -r1.184 src/usr.bin/make/job.c
cvs rdiff -u -r1.236 -r1.237 src/usr.bin/make/main.c
cvs rdiff -u -r1.96 -r1.97 src/usr.bin/make/make.h
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/make/meta.c
cvs rdiff -u -r1.207 -r1.208 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/arch.c
diff -u src/usr.bin/make/arch.c:1.65 src/usr.bin/make/arch.c:1.66
--- src/usr.bin/make/arch.c:1.65 Fri Jan 8 19:55:17 2016
+++ src/usr.bin/make/arch.c Sun Jan 17 10:32:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.65 2016/01/09 00:55:17 christos Exp $ */
+/* $NetBSD: arch.c,v 1.66 2016/01/17 15:32:38 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: arch.c,v 1.65 2016/01/09 00:55:17 christos Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.66 2016/01/17 15:32:38 christos Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: arch.c,v 1.65 2016/01/09 00:55:17 christos Exp $");
+__RCSID("$NetBSD: arch.c,v 1.66 2016/01/17 15:32:38 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -136,7 +136,6 @@ __RCSID("$NetBSD: arch.c,v 1.65 2016/01/
#include <ar.h>
#include <ctype.h>
-#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <utime.h>
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.183 src/usr.bin/make/job.c:1.184
--- src/usr.bin/make/job.c:1.183 Sun Jan 17 10:30:23 2016
+++ src/usr.bin/make/job.c Sun Jan 17 10:32:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.183 2016/01/17 15:30:23 christos Exp $ */
+/* $NetBSD: job.c,v 1.184 2016/01/17 15:32:38 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.183 2016/01/17 15:30:23 christos Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.184 2016/01/17 15:32:38 christos Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: job.c,v 1.183 2016/01/17 15:30:23 christos Exp $");
+__RCSID("$NetBSD: job.c,v 1.184 2016/01/17 15:32:38 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -141,7 +141,6 @@ __RCSID("$NetBSD: job.c,v 1.183 2016/01/
#include <assert.h>
#include <errno.h>
-#include <fcntl.h>
#ifndef USE_SELECT
#include <poll.h>
#endif
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.236 src/usr.bin/make/main.c:1.237
--- src/usr.bin/make/main.c:1.236 Fri Jan 8 19:55:17 2016
+++ src/usr.bin/make/main.c Sun Jan 17 10:32:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.236 2016/01/09 00:55:17 christos Exp $ */
+/* $NetBSD: main.c,v 1.237 2016/01/17 15:32:38 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.236 2016/01/09 00:55:17 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.237 2016/01/17 15:32:38 christos Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.236 2016/01/09 00:55:17 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.237 2016/01/17 15:32:38 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -125,7 +125,6 @@ __RCSID("$NetBSD: main.c,v 1.236 2016/01
#include <sys/wait.h>
#include <errno.h>
-#include <fcntl.h>
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.96 src/usr.bin/make/make.h:1.97
--- src/usr.bin/make/make.h:1.96 Mon Sep 21 17:50:16 2015
+++ src/usr.bin/make/make.h Sun Jan 17 10:32:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.96 2015/09/21 21:50:16 pooka Exp $ */
+/* $NetBSD: make.h,v 1.97 2016/01/17 15:32:38 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -84,6 +84,7 @@
#include <sys/param.h>
#include <ctype.h>
+#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -93,6 +94,10 @@
# include <sys/cdefs.h>
#endif
+#ifndef FD_CLOEXEC
+#define FD_CLOEXEC 1
+#endif
+
#if defined(__GNUC__)
#define MAKE_GNUC_PREREQ(x, y) \
((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.42 src/usr.bin/make/meta.c:1.43
--- src/usr.bin/make/meta.c:1.42 Sun Jan 17 10:30:23 2016
+++ src/usr.bin/make/meta.c Sun Jan 17 10:32:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.42 2016/01/17 15:30:23 christos Exp $ */
+/* $NetBSD: meta.c,v 1.43 2016/01/17 15:32:38 christos Exp $ */
/*
* Implement 'meta' mode.
@@ -37,7 +37,6 @@
#endif
#include <sys/stat.h>
#include <sys/ioctl.h>
-#include <fcntl.h>
#include <libgen.h>
#include <errno.h>
#if !defined(HAVE_CONFIG_H) || defined(HAVE_ERR_H)
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.207 src/usr.bin/make/parse.c:1.208
--- src/usr.bin/make/parse.c:1.207 Fri Jan 8 19:55:17 2016
+++ src/usr.bin/make/parse.c Sun Jan 17 10:32:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.207 2016/01/09 00:55:17 christos Exp $ */
+/* $NetBSD: parse.c,v 1.208 2016/01/17 15:32:38 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.207 2016/01/09 00:55:17 christos Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.208 2016/01/17 15:32:38 christos Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: parse.c,v 1.207 2016/01/09 00:55:17 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.208 2016/01/17 15:32:38 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -129,7 +129,6 @@ __RCSID("$NetBSD: parse.c,v 1.207 2016/0
#include <assert.h>
#include <ctype.h>
#include <errno.h>
-#include <fcntl.h>
#include <stdarg.h>
#include <stdio.h>
