morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1422 from keszybz/sd-daemon-mq-badf

Browse Source 
sd-daemon: fix return value for sd_is_mq
This commit is contained in:
Lennart Poettering
2015-09-30 22:33:50 +02:00
parent 23a749f285 0260d1d542
commit 32c6d387bf
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libsystemd/sd-daemon/sd-daemon.c
View File

@@ -310,10 +310,15 @@ _public_ int sd_is_socket_unix(int fd, int type, int listening, const char *path
_public_ int sd_is_mq(int fd, const char *path) {
struct mq_attr attr;
assert_return(fd >= 0, -EBADF);
/* Check that the fd is valid */
assert_return(fcntl(fd, F_GETFD) >= 0, -errno);
if (mq_getattr(fd, &attr) < 0)
if (mq_getattr(fd, &attr) < 0) {
if (errno == EBADF)
/* A non-mq fd (or an invalid one, but we ruled that out above) */
return 0;
return -errno;
}
if (path) {
char fpath[PATH_MAX];

2
src/systemctl/systemctl.c
View File

@@ -3110,7 +3110,7 @@ static int start_special(int argc, char *argv[], void *userdata) {
return r;
} else if (a == ACTION_EXIT && argc > 1) {
uint8_t code = 0;
uint8_t code;
/* If the exit code is not given on the command line,
* don't reset it to zero: just keep it as it might