summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-09-07 17:58:40 +0200
committerLudovic Courtès <ludo@gnu.org>2022-09-07 18:00:30 +0200
commit0aa1a9976fc3c6af4d1087e59d728cb8fe7d369a (patch)
tree6cf868ed4daa49a03b1bd485141614f8c89f8544
parenta356ceebee000efe91a2a16dbcaa64d6c6a3a922 (diff)
downloadguile-0aa1a9976fc3c6af4d1087e59d728cb8fe7d369a.tar.gz
'primitive-load' opens files with O_CLOEXEC.
Fixes <https://bugs.gnu.org/57567>. * libguile/load.c (scm_primitive_load): Add "e" flag to 'scm_open_file_with_encoding' argument. * NEWS: Update.
-rw-r--r--NEWS2
-rw-r--r--libguile/load.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index dfe1895ee..05bd1f6e5 100644
--- a/NEWS
+++ b/NEWS
@@ -52,6 +52,8 @@ for use with `setsockopt'.
** (web http) terminates chunked encoding with an extra \r\n
** (web client) retries TLS handshake upon non-fatal errors
(<https://bugs.gnu.org/49223>)
+** 'primitive-load' opens files as O_CLOEXEC
+ (<https://bugs.gnu.org/57567>)
Changes in 3.0.8 (since 3.0.7)
diff --git a/libguile/load.c b/libguile/load.c
index e95c36db1..bc254260e 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -1,4 +1,4 @@
-/* Copyright 1995-1996,1998-2001,2004,2006,2008-2019
+/* Copyright 1995-1996,1998-2001,2004,2006,2008-2019,2022
Free Software Foundation, Inc.
This file is part of Guile.
@@ -106,7 +106,7 @@ SCM_DEFINE (scm_primitive_load, "primitive-load", 1, 0, 0,
SCM port;
port = scm_open_file_with_encoding (filename,
- scm_from_latin1_string ("r"),
+ scm_from_latin1_string ("re"),
SCM_BOOL_T, /* guess_encoding */
scm_from_latin1_string ("UTF-8"));