[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v4 06/15] qga: use qga_open_cloexec() for safe_open_or_create
From: |
Markus Armbruster |
Subject: |
Re: [PATCH v4 06/15] qga: use qga_open_cloexec() for safe_open_or_create() |
Date: |
Tue, 24 May 2022 16:53:58 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) |
marcandre.lureau@redhat.com writes:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> The function takes care of setting CLOEXEC, and reporting error.
>
> The reported error message will differ, from:
> "failed to open file 'foo' (mode: 'r')"
> to:
> "Failed to open file 'foo'"
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> ---
> qga/commands-posix.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
> index 8ee149e550..28fe19d932 100644
> --- a/qga/commands-posix.c
> +++ b/qga/commands-posix.c
> @@ -27,6 +27,7 @@
> #include "qemu/cutils.h"
> #include "commands-common.h"
> #include "block/nvme.h"
> +#include "cutils.h"
>
> #ifdef HAVE_UTMPX
> #include <utmpx.h>
> @@ -339,6 +340,7 @@ find_open_flag(const char *mode_str, Error **errp)
> static FILE *
> safe_open_or_create(const char *path, const char *mode, Error **errp)
> {
> + ERRP_GUARD();
> int oflag;
> int fd = -1;
> FILE *f = NULL;
> @@ -370,20 +372,17 @@ 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 = qga_open_cloexec(path, oflag | ((oflag & O_CREAT) ? O_EXCL : 0), 0,
> errp);
Long line.
> if (fd == -1 && errno == EEXIST) {
> + error_free(*errp);
> + *errp = NULL;
> oflag &= ~(unsigned)O_CREAT;
> - fd = open(path, oflag);
> + fd = qga_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')",
Simpler:
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 8ee149e550..516658a7f6 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -27,6 +27,7 @@
#include "qemu/cutils.h"
#include "commands-common.h"
#include "block/nvme.h"
+#include "cutils.h"
#ifdef HAVE_UTMPX
#include <utmpx.h>
@@ -370,10 +371,10 @@ 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 = qga_open_cloexec(path, oflag | ((oflag & O_CREAT) ? O_EXCL : 0), 0,
NULL);
if (fd == -1 && errno == EEXIST) {
oflag &= ~(unsigned)O_CREAT;
- fd = open(path, oflag);
+ fd = qga_open_cloexec(path, oflag, 0, NULL);
}
if (fd == -1) {
error_setg_errno(errp, errno,
@@ -382,8 +383,6 @@ safe_open_or_create(const char *path, const char *mode,
Error **errp)
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')",
qga_open_cloexec()'s parameter @errp then has no user, and can be
dropped.
Recommendation, not demand.
- Re: [PATCH v4 15/15] test/qga: use g_auto wherever sensible, (continued)
- [PATCH v4 05/15] qga: add qga_open_cloexec() helper, marcandre . lureau, 2022/05/24
- [PATCH v4 12/15] qga/wixl: require Mingw_bin, marcandre . lureau, 2022/05/24
- [PATCH v4 09/15] qga: make build_fs_mount_list() return a bool, marcandre . lureau, 2022/05/24
- [PATCH v4 13/15] qga/wixl: simplify some pre-processing, marcandre . lureau, 2022/05/24
- [PATCH v4 11/15] qga/wixl: prefer variables over environment, marcandre . lureau, 2022/05/24
- [PATCH v4 14/15] qga/wixl: replace QEMU_GA_MSI_MINGW_BIN_PATH with glib bindir, marcandre . lureau, 2022/05/24
- [PATCH v4 02/15] util/win32: simplify qemu_get_local_state_dir(), marcandre . lureau, 2022/05/24
- [PATCH v4 06/15] qga: use qga_open_cloexec() for safe_open_or_create(), marcandre . lureau, 2022/05/24
- Re: [PATCH v4 06/15] qga: use qga_open_cloexec() for safe_open_or_create(),
Markus Armbruster <=
- [PATCH v4 04/15] qga: flatten safe_open_or_create(), marcandre . lureau, 2022/05/24
- [PATCH v4 08/15] qga: replace qemu_open_old() with qga_open_cloexec(), marcandre . lureau, 2022/05/24
- [PATCH v4 10/15] test/qga: use G_TEST_DIR to locate os-release test file, marcandre . lureau, 2022/05/24