[libgsystem] fileutils: Handle EINTR around open()
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgsystem] fileutils: Handle EINTR around open()
- Date: Sun, 6 Jan 2013 11:25:01 +0000 (UTC)
commit c98f7e4604d50837074585368b6913b93d3af265
Author: Colin Walters <walters verbum org>
Date: Sun Jan 6 06:04:58 2013 -0500
fileutils: Handle EINTR around open()
Just noticed via code inspection.
gsystem-file-utils.c | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/gsystem-file-utils.c b/gsystem-file-utils.c
index 312ea2f..93a3d68 100644
--- a/gsystem-file-utils.c
+++ b/gsystem-file-utils.c
@@ -49,18 +49,28 @@ close_nointr_noerror (int fd)
}
static int
+open_nointr (const char *path, int flags, mode_t mode)
+{
+ int res;
+ do
+ res = open (path, flags, mode);
+ while (G_UNLIKELY (res != 0 && errno == EINTR));
+ return res;
+}
+
+static int
_open_fd_noatime (const char *path)
{
int fd;
#ifdef O_NOATIME
- fd = g_open (path, O_RDONLY | O_NOATIME, 0);
+ fd = open_nointr (path, O_RDONLY | O_NOATIME, 0);
/* Only the owner or superuser may use O_NOATIME; so we may get
* EPERM. EINVAL may happen if the kernel is really old...
*/
if (fd == -1 && (errno == EPERM || errno == EINVAL))
#endif
- fd = g_open (path, O_RDONLY, 0);
+ fd = open_nointr (path, O_RDONLY, 0);
return fd;
}
@@ -254,6 +264,7 @@ get_default_tmp_prefix (void)
return tmpprefix;
}
+
static char *
gen_tmp_name (const char *prefix,
const char *suffix)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]