diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2023-02-22 13:07:35 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2023-02-22 13:07:35 +0000 |
| commit | 0a715be5997abd13b9bddeb100af31e9678b4a47 (patch) | |
| tree | fbfb8aac2c61dce8bad13c0caed54b8f52486e4b | |
| parent | ddf85f9d9e4ee608107785a24b5ad9ddfcb5f379 (diff) | |
| parent | 8f8ebb1bd0bec494a3037c3aa1c4922a241a89c9 (diff) | |
| download | glib-0a715be5997abd13b9bddeb100af31e9678b4a47.tar.gz | |
Merge branch 'cloexec-other' into 'main'
Close-on-exec flag few missed places
See merge request GNOME/glib!3292
| -rw-r--r-- | gio/glocalfileoutputstream.c | 2 | ||||
| -rw-r--r-- | gio/gunixmounts.c | 10 | ||||
| -rw-r--r-- | glib/gfileutils.c | 6 | ||||
| -rw-r--r-- | glib/grand.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c index 74a642da8..6875811d0 100644 --- a/gio/glocalfileoutputstream.c +++ b/gio/glocalfileoutputstream.c @@ -1040,7 +1040,7 @@ handle_overwrite_open (const char *filename, tmp_filename = g_build_filename (dirname, ".goutputstream-XXXXXX", NULL); g_free (dirname); - tmpfd = g_mkstemp_full (tmp_filename, (readable ? O_RDWR : O_WRONLY) | O_BINARY, mode); + tmpfd = g_mkstemp_full (tmp_filename, (readable ? O_RDWR : O_WRONLY) | O_BINARY | O_CLOEXEC, mode); if (tmpfd == -1) { g_free (tmp_filename); diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c index 4a2f0a248..9e97ef1c9 100644 --- a/gio/gunixmounts.c +++ b/gio/gunixmounts.c @@ -585,7 +585,7 @@ _g_get_unix_mounts (void) read_file = get_mtab_read_file (); - file = setmntent (read_file, "r"); + file = setmntent (read_file, "re"); if (file == NULL) return NULL; @@ -727,7 +727,7 @@ _g_get_unix_mounts (void) read_file = get_mtab_read_file (); - file = setmntent (read_file, "r"); + file = setmntent (read_file, "re"); if (file == NULL) return NULL; @@ -1114,7 +1114,7 @@ _g_get_unix_mount_points (void) read_file = get_fstab_file (); - file = setmntent (read_file, "r"); + file = setmntent (read_file, "re"); if (file == NULL) return NULL; @@ -1203,7 +1203,7 @@ _g_get_unix_mount_points (void) read_file = get_fstab_file (); - file = setmntent (read_file, "r"); + file = setmntent (read_file, "re"); if (file == NULL) return NULL; @@ -1378,7 +1378,7 @@ _g_get_unix_mount_points (void) read_file = get_fstab_file (); - file = setmntent (read_file, "r"); + file = setmntent (read_file, "re"); if (file == NULL) return NULL; diff --git a/glib/gfileutils.c b/glib/gfileutils.c index ef3fc90f2..4ed8171cc 100644 --- a/glib/gfileutils.c +++ b/glib/gfileutils.c @@ -1351,7 +1351,7 @@ g_file_set_contents_full (const gchar *filename, tmp_filename = g_strdup_printf ("%s.XXXXXX", filename); errno = 0; - fd = g_mkstemp_full (tmp_filename, O_RDWR | O_BINARY, mode); + fd = g_mkstemp_full (tmp_filename, O_RDWR | O_BINARY | O_CLOEXEC, mode); if (fd == -1) { @@ -1704,7 +1704,7 @@ g_mkstemp_full (gchar *tmpl, gint g_mkstemp (gchar *tmpl) { - return g_mkstemp_full (tmpl, O_RDWR | O_BINARY, 0600); + return g_mkstemp_full (tmpl, O_RDWR | O_BINARY | O_CLOEXEC, 0600); } static gint @@ -1826,7 +1826,7 @@ g_file_open_tmp (const gchar *tmpl, result = g_get_tmp_name (tmpl, &fulltemplate, wrap_g_open, - O_CREAT | O_EXCL | O_RDWR | O_BINARY, + O_CREAT | O_EXCL | O_RDWR | O_BINARY | O_CLOEXEC, 0600, error); if (result != -1) diff --git a/glib/grand.c b/glib/grand.c index 1c56d0195..5fb44576d 100644 --- a/glib/grand.c +++ b/glib/grand.c @@ -230,7 +230,7 @@ g_rand_new (void) do { - dev_urandom = fopen("/dev/urandom", "rb"); + dev_urandom = fopen ("/dev/urandom", "rbe"); } while G_UNLIKELY (dev_urandom == NULL && errno == EINTR); |