vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

conmon/cmsg: Distinguish error(s) from errorf(fmt, ...) and replace %m

Browse source 
The same as the last two commits, except for cmsg.c instead of
conmon.c.

Signed-off-by: W. Trevor King <wking@tremily.us>
This commit is contained in:
W. Trevor King 2018-02-23 11:11:18 -08:00
parent f67d6ed25c
commit 9356aa9dd8
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
conmon/cmsg.c
View file

@ -26,9 +26,16 @@
#include "cmsg.h" #include "cmsg.h"
#define error(fmt, ...) \ #define error(s) \
({ \ ({ \
fprintf(stderr, "nsenter: " fmt ": %m\n", ##__VA_ARGS__); \ fprintf(stderr, "nsenter: %s %s\n", s, strerror(errno)); \
errno = ECOMM; \
goto err; /* return value */ \
})
#define errorf(fmt, ...) \
({ \
fprintf(stderr, "nsenter: " fmt ": %s\n", ##__VA_ARGS__, strerror(errno)); \
errno = ECOMM; \ errno = ECOMM; \
goto err; /* return value */ \ goto err; /* return value */ \
}) })
@ -103,7 +110,7 @@ struct file_t recvfd(int sockfd)
/* TODO: Make this dynamic with MSG_PEEK. */ /* TODO: Make this dynamic with MSG_PEEK. */
file.name = malloc(TAG_BUFFER); file.name = malloc(TAG_BUFFER);
if (!file.name) if (!file.name)
error("recvfd: failed to allocate file.tag buffer\n"); error("recvfd: failed to allocate file.tag buffer");
/* /*
* We need to "recieve" the non-ancillary data even though we don't * We need to "recieve" the non-ancillary data even though we don't
@ -128,11 +135,11 @@ struct file_t recvfd(int sockfd)
if (!cmsg) if (!cmsg)
error("recvfd: got NULL from CMSG_FIRSTHDR"); error("recvfd: got NULL from CMSG_FIRSTHDR");
if (cmsg->cmsg_level != SOL_SOCKET) if (cmsg->cmsg_level != SOL_SOCKET)
error("recvfd: expected SOL_SOCKET in cmsg: %d", cmsg->cmsg_level); errorf("recvfd: expected SOL_SOCKET in cmsg: %d", cmsg->cmsg_level);
if (cmsg->cmsg_type != SCM_RIGHTS) if (cmsg->cmsg_type != SCM_RIGHTS)
error("recvfd: expected SCM_RIGHTS in cmsg: %d", cmsg->cmsg_type); errorf("recvfd: expected SCM_RIGHTS in cmsg: %d", cmsg->cmsg_type);
if (cmsg->cmsg_len != CMSG_LEN(sizeof(int))) if (cmsg->cmsg_len != CMSG_LEN(sizeof(int)))
error("recvfd: expected correct CMSG_LEN in cmsg: %lu", cmsg->cmsg_len); errorf("recvfd: expected correct CMSG_LEN in cmsg: %lu", cmsg->cmsg_len);
fdptr = (int *) CMSG_DATA(cmsg); fdptr = (int *) CMSG_DATA(cmsg);
if (!fdptr || *fdptr < 0) if (!fdptr || *fdptr < 0)