diff options
author | Stefano Brivio <sbrivio@redhat.com> | 2024-10-25 00:10:36 +0200 |
---|---|---|
committer | Stefano Brivio <sbrivio@redhat.com> | 2024-10-30 12:37:31 +0100 |
commit | 59fe34ee36368bb28c8298b1a1bfad5d0d9f47a3 (patch) | |
tree | 38745c05d3b8c5836380133c33f1e60d2a0e0847 /util.c | |
parent | 134b4d58b409013d9f231aac1d4ba69f7835da7c (diff) | |
download | passt-59fe34ee36368bb28c8298b1a1bfad5d0d9f47a3.tar passt-59fe34ee36368bb28c8298b1a1bfad5d0d9f47a3.tar.gz passt-59fe34ee36368bb28c8298b1a1bfad5d0d9f47a3.tar.bz2 passt-59fe34ee36368bb28c8298b1a1bfad5d0d9f47a3.tar.lz passt-59fe34ee36368bb28c8298b1a1bfad5d0d9f47a3.tar.xz passt-59fe34ee36368bb28c8298b1a1bfad5d0d9f47a3.tar.zst passt-59fe34ee36368bb28c8298b1a1bfad5d0d9f47a3.zip |
treewide: Suppress clang-tidy warning if we already use O_CLOEXEC
In pcap_init(), we should always open the packet capture file with
O_CLOEXEC, even if we're not running in foreground: O_CLOEXEC means
close-on-exec, not close-on-fork.
In logfile_init() and pidfile_open(), the fact that we pass a third
'mode' argument to open() seems to confuse the android-cloexec-open
checker in LLVM versions from 16 to 19 (at least).
The checker is suggesting to add O_CLOEXEC to 'mode', and not in
'flags', where we already have it.
Add a suppression for clang-tidy and a comment, and avoid repeating
those three times by adding a new helper, output_file_open().
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'util.c')
-rw-r--r-- | util.c | 27 |
1 files changed, 11 insertions, 16 deletions
@@ -407,25 +407,20 @@ void pidfile_write(int fd, pid_t pid) } /** - * pidfile_open() - Open PID file if needed - * @path: Path for PID file, empty string if no PID file is requested + * output_file_open() - Open file for output, if needed + * @path: Path for output file + * @flags: Flags for open() other than O_CREAT, O_TRUNC, O_CLOEXEC * - * Return: descriptor for PID file, -1 if path is NULL, won't return on failure + * Return: file descriptor on success, -1 on failure with errno set by open() */ -int pidfile_open(const char *path) +int output_file_open(const char *path, int flags) { - int fd; - - if (!*path) - return -1; - - if ((fd = open(path, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, - S_IRUSR | S_IWUSR)) < 0) { - perror("PID file open"); - exit(EXIT_FAILURE); - } - - return fd; + /* We use O_CLOEXEC here, but clang-tidy as of LLVM 16 to 19 looks for + * it in the 'mode' argument if we have one + */ + return open(path, O_CREAT | O_TRUNC | O_CLOEXEC | flags, + /* NOLINTNEXTLINE(android-cloexec-open) */ + S_IRUSR | S_IWUSR); } /** |