luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-19 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

glib: Pass O_CLOEXEC rather than FD_CLOEXEC to g_unix_open_pipe()

Browse Source 
See the previous commit.

Signed-off-by: Philip Withnall <philip@tecnocode.co.uk>
This commit is contained in:
Philip Withnall 2023-08-16 14:31:02 +01:00
parent d0dc7171d6
commit 07c4b6c68e
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gfile.c
View File

@ -3188,7 +3188,7 @@ splice_stream_with_progress (GInputStream *in,
fd_in = g_file_descriptor_based_get_fd (G_FILE_DESCRIPTOR_BASED (in)); fd_in = g_file_descriptor_based_get_fd (G_FILE_DESCRIPTOR_BASED (in));
fd_out = g_file_descriptor_based_get_fd (G_FILE_DESCRIPTOR_BASED (out)); fd_out = g_file_descriptor_based_get_fd (G_FILE_DESCRIPTOR_BASED (out));
if (!g_unix_open_pipe (buffer, FD_CLOEXEC, error)) if (!g_unix_open_pipe (buffer, O_CLOEXEC, error))
return FALSE; return FALSE;
/* Try a 1MiB buffer for improved throughput. If that fails, use the default /* Try a 1MiB buffer for improved throughput. If that fails, use the default

2
gio/gtestdbus.c
View File

@ -604,7 +604,7 @@ make_pipe (gint pipe_fds[2],
GError **error) GError **error)
{ {
#if defined(G_OS_UNIX) #if defined(G_OS_UNIX)
return g_unix_open_pipe (pipe_fds, FD_CLOEXEC, error); return g_unix_open_pipe (pipe_fds, O_CLOEXEC, error);
#elif defined(G_OS_WIN32) #elif defined(G_OS_WIN32)
if (_pipe (pipe_fds, 4096, _O_BINARY) < 0) if (_pipe (pipe_fds, 4096, _O_BINARY) < 0)
{ {

4
gio/tests/gdbus-close-pending.c
View File

@ -306,9 +306,9 @@ test_once (Fixture *f,
GDBusMessage *message; GDBusMessage *message;
gboolean pipe_res; gboolean pipe_res;
pipe_res = g_unix_open_pipe (f->server_to_client, FD_CLOEXEC, &f->error); pipe_res = g_unix_open_pipe (f->server_to_client, O_CLOEXEC, &f->error);
g_assert (pipe_res); g_assert (pipe_res);
pipe_res = g_unix_open_pipe (f->client_to_server, FD_CLOEXEC, &f->error); pipe_res = g_unix_open_pipe (f->client_to_server, O_CLOEXEC, &f->error);
g_assert (pipe_res); g_assert (pipe_res);
f->server_iostream = my_io_stream_new_for_fds (f->client_to_server[0], f->server_iostream = my_io_stream_new_for_fds (f->client_to_server[0],

8
gio/tests/gsubprocess.c
View File

@ -1750,9 +1750,9 @@ do_test_pass_fd (GSubprocessFlags flags,
char *basic_fd_str; char *basic_fd_str;
char *needdup_fd_str; char *needdup_fd_str;
g_unix_open_pipe (basic_pipefds, FD_CLOEXEC, error); g_unix_open_pipe (basic_pipefds, O_CLOEXEC, error);
g_assert_no_error (local_error); g_assert_no_error (local_error);
g_unix_open_pipe (needdup_pipefds, FD_CLOEXEC, error); g_unix_open_pipe (needdup_pipefds, O_CLOEXEC, error);
g_assert_no_error (local_error); g_assert_no_error (local_error);
basic_fd_str = g_strdup_printf ("%d", basic_pipefds[1]); basic_fd_str = g_strdup_printf ("%d", basic_pipefds[1]);
@ -1854,10 +1854,10 @@ do_test_fd_conflation (GSubprocessFlags flags,
return; return;
} }
g_unix_open_pipe (unused_pipefds, FD_CLOEXEC, &error); g_unix_open_pipe (unused_pipefds, O_CLOEXEC, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_unix_open_pipe (pipefds, FD_CLOEXEC, &error); g_unix_open_pipe (pipefds, O_CLOEXEC, &error);
g_assert_no_error (error); g_assert_no_error (error);
/* The fds should be sequential since we are in a new process. */ /* The fds should be sequential since we are in a new process. */

2
gio/tests/unix-fd.c
View File

@ -63,7 +63,7 @@ test_fd_list (void)
s = _pipe (sv, 4096, _O_NOINHERIT | _O_BINARY); s = _pipe (sv, 4096, _O_NOINHERIT | _O_BINARY);
g_assert_cmpint (s, ==, 0); g_assert_cmpint (s, ==, 0);
#else #else
g_unix_open_pipe (sv, FD_CLOEXEC, &err); g_unix_open_pipe (sv, O_CLOEXEC, &err);
g_assert_no_error (err); g_assert_no_error (err);
#endif #endif
list = g_unix_fd_list_new_from_array (sv, -1); list = g_unix_fd_list_new_from_array (sv, -1);

2
glib/gtester.c
View File

@ -305,7 +305,7 @@ launch_test_binary (const char *binary,
gboolean loop_pending; gboolean loop_pending;
gint i = 0; gint i = 0;
if (!g_unix_open_pipe (report_pipe, FD_CLOEXEC, &error)) if (!g_unix_open_pipe (report_pipe, O_CLOEXEC, &error))
{ {
if (subtest_mode_fatal) if (subtest_mode_fatal)
g_error ("Failed to open pipe for test binary: %s: %s", binary, error->message); g_error ("Failed to open pipe for test binary: %s: %s", binary, error->message);

2
glib/gwakeup.c
View File

@ -160,7 +160,7 @@ g_wakeup_new (void)
/* for any failure, try a pipe instead */ /* for any failure, try a pipe instead */
#endif #endif
if (!g_unix_open_pipe (wakeup->fds, FD_CLOEXEC | O_NONBLOCK, &error)) if (!g_unix_open_pipe (wakeup->fds, O_CLOEXEC | O_NONBLOCK, &error))
g_error ("Creating pipes for GWakeup: %s", error->message); g_error ("Creating pipes for GWakeup: %s", error->message);
if (!g_unix_set_fd_nonblocking (wakeup->fds[0], TRUE, &error) || if (!g_unix_set_fd_nonblocking (wakeup->fds[0], TRUE, &error) ||

2
glib/tests/spawn-singlethread.c
View File

@ -237,7 +237,7 @@ test_spawn_async_with_fds (void)
break; break;
case PIPE: case PIPE:
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
g_unix_open_pipe (test_pipe[j], FD_CLOEXEC, &error); g_unix_open_pipe (test_pipe[j], O_CLOEXEC, &error);
g_assert_no_error (error); g_assert_no_error (error);
#else #else
g_assert_cmpint (_pipe (test_pipe[j], 4096, _O_BINARY), >=, 0); g_assert_cmpint (_pipe (test_pipe[j], 4096, _O_BINARY), >=, 0);

6
glib/tests/unix.c
View File

@ -41,7 +41,7 @@ test_pipe (void)
gssize bytes_read; gssize bytes_read;
gboolean res; gboolean res;
res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error); res = g_unix_open_pipe (pipefd, O_CLOEXEC, &error);
g_assert (res); g_assert (res);
g_assert_no_error (error); g_assert_no_error (error);
@ -103,7 +103,7 @@ test_pipe_stdio_overwrite (void)
g_close (STDIN_FILENO, &error); g_close (STDIN_FILENO, &error);
g_assert_no_error (error); g_assert_no_error (error);
res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error); res = g_unix_open_pipe (pipefd, O_CLOEXEC, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_assert_true (res); g_assert_true (res);
@ -143,7 +143,7 @@ test_nonblocking (void)
gboolean res; gboolean res;
int flags; int flags;
res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error); res = g_unix_open_pipe (pipefd, O_CLOEXEC, &error);
g_assert (res); g_assert (res);
g_assert_no_error (error); g_assert_no_error (error);