mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-29 19:30:36 +02:00
Code Activity

Use /dev/null in 'piped-process' if port is not backed by a fdes.

Browse source 
In Guile 3.0.9, 'system*' would no longer open /dev/null for file
descriptors 0, 1, and 2 when its 'current-input-port',
'current-output-port', or 'current-output-port' is not bound to a file
port.  This patch reinstates that behavior.

Fixes <https://bugs.gnu.org/63024>.

* libguile/posix.c (piped_process): Open /dev/null to use as in/out/err
if the corresponding port is not backed by a file descriptor.
* test-suite/tests/posix.test ("system*")["https://bugs.gnu.org/63024"]:
New test.
* NEWS: Update.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Josselin Poiret 2023-05-05 15:39:23 +02:00 • committed by Ludovic Courtès
parent ccd7400fdb
commit 36fd2b4920
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -29,6 +29,8 @@ the compiler reports it as "possibly unused".
(<https://bugs.gnu.org/61095>)
** Adjust 'spawn' test for GNU/Hurd
(<https://bugs.gnu.org/62501>)
** Fix 'system*' with non-file input/output/error port
(<https://bugs.gnu.org/63024>)
** Hashing of UTF-8 symbols with non-ASCII characters avoids corruption
(<https://bugs.gnu.org/56413>)

20
libguile/posix.c
View file

@ -1562,10 +1562,22 @@ piped_process (pid_t *pid, SCM prog, SCM args, SCM from, SCM to)
if (SCM_OPOUTFPORTP ((port = scm_current_error_port ())))
err = SCM_FPORT_FDES (port);
if (out == -1 && SCM_OPOUTFPORTP ((port = scm_current_output_port ())))
out = SCM_FPORT_FDES (port);
if (in == -1 && SCM_OPINFPORTP ((port = scm_current_input_port ())))
in = SCM_FPORT_FDES (port);
else
err = open ("/dev/null", O_WRONLY | O_CLOEXEC);
if (out == -1)
{
if (SCM_OPOUTFPORTP ((port = scm_current_output_port ())))
out = SCM_FPORT_FDES (port);
else
out = open ("/dev/null", O_WRONLY | O_CLOEXEC);
}
if (in == -1)
{
if (SCM_OPINFPORTP ((port = scm_current_input_port ())))
in = SCM_FPORT_FDES (port);
else
in = open ("/dev/null", O_RDONLY | O_CLOEXEC);
}
}
*pid = do_spawn (exec_file, exec_argv, exec_env, in, out, err, 1);

12
test-suite/tests/posix.test
View file

@ -374,7 +374,17 @@
(system* "sh" "-c" "echo bong >&2"))))))))
(and (zero? (status:exit-val status))
(call-with-input-file file get-string-all)))))
(call-with-input-file file get-string-all))))
(pass-if-equal "https://bugs.gnu.org/63024"
0
(if (file-exists? "/proc/self/fd/0") ;on GNU/Linux?
(parameterize ((current-output-port (%make-void-port "w0")))
(system* "guile" "-c"
(object->string
'(exit (string=? "/dev/null"
(readlink "/proc/self/fd/1"))))))
(throw 'unresolved))))
;;
;; spawn