From 33d19692e83504a53e4e01e8d2805db0e96f0ef5 Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Thu, 1 Dec 2016 02:21:36 +0000 Subject: [PATCH] Remove a death threat from the FreeBSD sources Reported by: koobs@, araujo@, linimon@, bjk@, emaste@, jhb@, ngie@, cem@ Maintainer timeout: des@ --- lib/libutil/flopen.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/libutil/flopen.c b/lib/libutil/flopen.c index bc4119dcb1cc..89297290796e 100644 --- a/lib/libutil/flopen.c +++ b/lib/libutil/flopen.c @@ -40,10 +40,10 @@ __FBSDID("$FreeBSD$"); /* * Reliably open and lock a file. * - * DO NOT, UNDER PAIN OF DEATH, modify this code without first reading the - * revision history and discussing your changes with . - * Don't be fooled by the code's apparent simplicity; there would be no - * need for this function if it was as easy to get right as you think. + * Please do not modify this code without first reading the revision history + * and discussing your changes with . Don't be fooled by the + * code's apparent simplicity; there would be no need for this function if it + * was easy to get right. */ int flopen(const char *path, int flags, ...) @@ -108,7 +108,11 @@ flopen(const char *path, int flags, ...) errno = serrno; return (-1); } -#ifdef DONT_EVEN_THINK_ABOUT_IT + /* + * The following change is provided as a specific example to + * avoid. + */ +#if 0 if (fcntl(fd, F_SETFD, FD_CLOEXEC) != 0) { serrno = errno; (void)close(fd);