mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-23 14:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source 
- remove __attribute__ destructor
- use sendto instead of connect/write
This commit is contained in:
HAMANO Tsukasa 2024-05-09 08:26:41 +09:00
parent c14e3329c0
commit 995a2d45bc
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/sd-notify.h
View File

@ -12,14 +12,6 @@
#include <sys/un.h>
#include <unistd.h>
#define _cleanup_(f) __attribute__((cleanup(f)))
static void closep(int *fd) {
if (!fd || *fd < 0)
return;
close(*fd);
*fd = -1;
}
static int sd_notify(int ignore, const char *message) {
union sockaddr_union {
struct sockaddr sa;
@ -28,8 +20,9 @@ static int sd_notify(int ignore, const char *message) {
.sun.sun_family = AF_UNIX,
};
size_t path_length, message_length;
_cleanup_(closep) int fd = -1;
const char *socket_path;
int fd = -1;
int rc = 1;
socket_path = getenv("NOTIFY_SOCKET");
if (!socket_path)
@ -61,12 +54,11 @@ static int sd_notify(int ignore, const char *message) {
if (fd < 0)
return -errno;
if (connect(fd, &socket_addr.sa, offsetof(struct sockaddr_un, sun_path) + path_length) != 0)
return -errno;
ssize_t written = write(fd, message, message_length);
ssize_t written = sendto(fd, message, message_length, 0,
&socket_addr.sa, offsetof(struct sockaddr_un, sun_path) + path_length);
if (written != (ssize_t) message_length)
return written < 0 ? -errno : -EPROTO;
rc = written < 0 ? -errno : -EPROTO;
return 1; /* Notified! */
close(fd);
return rc;
}