[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/15] qga: use qemu_open_cloexec() for safe_open_or_create()
From: |
marcandre . lureau |
Subject: |
[PATCH v2 07/15] qga: use qemu_open_cloexec() for safe_open_or_create() |
Date: |
Thu, 5 May 2022 12:14:23 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The function takes care of setting CLOEXEC, and reporting error.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
qga/commands-posix.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 0ef049650e31..8ebc327c5e02 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -370,21 +370,16 @@ safe_open_or_create(const char *path, const char *mode,
Error **errp)
* open() is decisive and its third argument is ignored, and the second
* open() and the fchmod() are never called.
*/
- fd = open(path, oflag | ((oflag & O_CREAT) ? O_EXCL : 0), 0);
+ fd = qemu_open_cloexec(path, oflag | ((oflag & O_CREAT) ? O_EXCL : 0), 0,
errp);
if (fd == -1 && errno == EEXIST) {
+ g_clear_pointer(errp, error_free);
oflag &= ~(unsigned)O_CREAT;
- fd = open(path, oflag);
+ fd = qemu_open_cloexec(path, oflag, 0, errp);
}
if (fd == -1) {
- error_setg_errno(errp, errno,
- "failed to open file '%s' "
- "(mode: '%s')",
- path, mode);
goto end;
}
- qemu_set_cloexec(fd);
-
if ((oflag & O_CREAT) && fchmod(fd, DEFAULT_NEW_FILE_MODE) == -1) {
error_setg_errno(errp, errno,
"failed to set permission 0%03o on new file '%s'
(mode: '%s')",
--
2.36.0.44.g0f828332d5ac
- [PATCH v2 02/15] util/win32: simplify qemu_get_local_state_dir(), (continued)
- [PATCH v2 05/15] qga: flatten safe_open_or_create(), marcandre . lureau, 2022/05/05
- [PATCH v2 04/15] include: adjust header guards after renaming, marcandre . lureau, 2022/05/05
- [PATCH v2 07/15] qga: use qemu_open_cloexec() for safe_open_or_create(),
marcandre . lureau <=
- [PATCH v2 06/15] osdep: export qemu_open_cloexec(), marcandre . lureau, 2022/05/05
- [PATCH v2 08/15] qga: throw an Error in ga_channel_open(), marcandre . lureau, 2022/05/05
- [PATCH v2 09/15] qga: replace qemu_open_old() with qemu_open_cloexec(), marcandre . lureau, 2022/05/05
- [PATCH v2 10/15] test/qga: use G_TEST_DIR to locate os-release test file, marcandre . lureau, 2022/05/05