chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dbus: import struct unit_info from systemctl
[elogind.git]
/
src
/
libsystemd-daemon
/
sd-daemon.c
diff --git
a/src/libsystemd-daemon/sd-daemon.c
b/src/libsystemd-daemon/sd-daemon.c
index 763e079b4ec0ac7cfa9bda49341e29a0672f2e87..80aadf7adfc7c6da21acb7d3bd64cb6f74b6e0cc 100644
(file)
--- a/
src/libsystemd-daemon/sd-daemon.c
+++ b/
src/libsystemd-daemon/sd-daemon.c
@@
-75,7
+75,8
@@
_sd_export_ int sd_listen_fds(int unset_environment) {
char *p = NULL;
unsigned long l;
char *p = NULL;
unsigned long l;
- if (!(e = getenv("LISTEN_PID"))) {
+ e = getenv("LISTEN_PID");
+ if (!e) {
r = 0;
goto finish;
}
r = 0;
goto finish;
}
@@
-88,7
+89,7
@@
_sd_export_ int sd_listen_fds(int unset_environment) {
goto finish;
}
goto finish;
}
- if (!p || *p || l <= 0) {
+ if (!p ||
p == e ||
*p || l <= 0) {
r = -EINVAL;
goto finish;
}
r = -EINVAL;
goto finish;
}
@@
-99,7
+100,8
@@
_sd_export_ int sd_listen_fds(int unset_environment) {
goto finish;
}
goto finish;
}
- if (!(e = getenv("LISTEN_FDS"))) {
+ e = getenv("LISTEN_FDS");
+ if (!e) {
r = 0;
goto finish;
}
r = 0;
goto finish;
}
@@
-112,7
+114,7
@@
_sd_export_ int sd_listen_fds(int unset_environment) {
goto finish;
}
goto finish;
}
- if (!p || *p) {
+ if (!p ||
p == e ||
*p) {
r = -EINVAL;
goto finish;
}
r = -EINVAL;
goto finish;
}
@@
-120,7
+122,8
@@
_sd_export_ int sd_listen_fds(int unset_environment) {
for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) {
int flags;
for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) {
int flags;
- if ((flags = fcntl(fd, F_GETFD)) < 0) {
+ flags = fcntl(fd, F_GETFD);
+ if (flags < 0) {
r = -errno;
goto finish;
}
r = -errno;
goto finish;
}
@@
-152,7
+155,6
@@
_sd_export_ int sd_is_fifo(int fd, const char *path) {
if (fd < 0)
return -EINVAL;
if (fd < 0)
return -EINVAL;
- memset(&st_fd, 0, sizeof(st_fd));
if (fstat(fd, &st_fd) < 0)
return -errno;
if (fstat(fd, &st_fd) < 0)
return -errno;
@@
-162,7
+164,6
@@
_sd_export_ int sd_is_fifo(int fd, const char *path) {
if (path) {
struct stat st_path;
if (path) {
struct stat st_path;
- memset(&st_path, 0, sizeof(st_path));
if (stat(path, &st_path) < 0) {
if (errno == ENOENT || errno == ENOTDIR)
if (stat(path, &st_path) < 0) {
if (errno == ENOENT || errno == ENOTDIR)
@@
-272,7
+273,8
@@
_sd_export_ int sd_is_socket(int fd, int family, int type, int listening) {
if (family < 0)
return -EINVAL;
if (family < 0)
return -EINVAL;
- if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
+ r = sd_is_socket_internal(fd, type, listening);
+ if (r <= 0)
return r;
if (family > 0) {
return r;
if (family > 0) {
@@
-302,7
+304,8
@@
_sd_export_ int sd_is_socket_inet(int fd, int family, int type, int listening, u
if (family != 0 && family != AF_INET && family != AF_INET6)
return -EINVAL;
if (family != 0 && family != AF_INET && family != AF_INET6)
return -EINVAL;
- if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
+ r = sd_is_socket_internal(fd, type, listening);
+ if (r <= 0)
return r;
memset(&sockaddr, 0, sizeof(sockaddr));
return r;
memset(&sockaddr, 0, sizeof(sockaddr));
@@
-344,7
+347,8
@@
_sd_export_ int sd_is_socket_unix(int fd, int type, int listening, const char *p
socklen_t l;
int r;
socklen_t l;
int r;
- if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
+ r = sd_is_socket_internal(fd, type, listening);
+ if (r <= 0)
return r;
memset(&sockaddr, 0, sizeof(sockaddr));
return r;
memset(&sockaddr, 0, sizeof(sockaddr));
@@
-360,10
+364,10
@@
_sd_export_ int sd_is_socket_unix(int fd, int type, int listening, const char *p
return 0;
if (path) {
return 0;
if (path) {
- if (length
<
= 0)
+ if (length
=
= 0)
length = strlen(path);
length = strlen(path);
- if (length
<
= 0)
+ if (length
=
= 0)
/* Unnamed socket */
return l == offsetof(struct sockaddr_un, sun_path);
/* Unnamed socket */
return l == offsetof(struct sockaddr_un, sun_path);
@@
-434,7
+438,8
@@
_sd_export_ int sd_notify(int unset_environment, const char *state) {
goto finish;
}
goto finish;
}
- if (!(e = getenv("NOTIFY_SOCKET")))
+ e = getenv("NOTIFY_SOCKET");
+ if (!e)
return 0;
/* Must be an abstract socket, or an absolute path */
return 0;
/* Must be an abstract socket, or an absolute path */
@@
-443,7
+448,8
@@
_sd_export_ int sd_notify(int unset_environment, const char *state) {
goto finish;
}
goto finish;
}
- if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) {
+ fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0);
+ if (fd < 0) {
r = -errno;
goto finish;
}
r = -errno;
goto finish;
}