chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: move field index from file into journal object
[elogind.git]
/
src
/
socket.c
diff --git
a/src/socket.c
b/src/socket.c
index 572e622011bfc02678925ef06826d5bbdce03fd9..7ddf326a2252c40481b5b86124dd45f25945d13a 100644
(file)
--- a/
src/socket.c
+++ b/
src/socket.c
@@
-844,7
+844,7
@@
static int mq_address_create(
fd = mq_open(path, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_CREAT, mq_mode, attr);
umask(old_mask);
fd = mq_open(path, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_CREAT, mq_mode, attr);
umask(old_mask);
- if (fd < 0
&& errno != EEXIST
) {
+ if (fd < 0) {
r = -errno;
goto fail;
}
r = -errno;
goto fail;
}
@@
-1962,6
+1962,12
@@
int socket_collect_fds(Socket *s, int **fds, unsigned *n_fds) {
if (p->fd >= 0)
rn_fds++;
if (p->fd >= 0)
rn_fds++;
+ if (rn_fds <= 0) {
+ *fds = NULL;
+ *n_fds = 0;
+ return 0;
+ }
+
if (!(rfds = new(int, rn_fds)))
return -ENOMEM;
if (!(rfds = new(int, rn_fds)))
return -ENOMEM;