From 6e7d018049193efe9d092bb91c4416a332f28278 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Fri, 19 Jan 2007 22:11:40 +0000 Subject: merge up to fuse_2_6_merge1 --- util/fusermount.c | 4 ++-- util/ulockmgr_server.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'util') diff --git a/util/fusermount.c b/util/fusermount.c index 47f335c..70903a0 100644 --- a/util/fusermount.c +++ b/util/fusermount.c @@ -437,7 +437,7 @@ static int has_fuseblk(void) return 1; while (fgets(buf, sizeof(buf), f)) - if (strcmp(buf, "fuseblk\n") == 0) { + if (strstr(buf, "fuseblk\n")) { fclose(f); return 1; } @@ -883,7 +883,7 @@ static int send_fd(int sock_fd, int fd) struct msghdr msg; struct cmsghdr *p_cmsg; struct iovec vec; - char cmsgbuf[CMSG_SPACE(sizeof(fd))]; + size_t cmsgbuf[CMSG_SPACE(sizeof(fd)) / sizeof(size_t)]; int *p_fds; char sendchar = 0; diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c index 0d00975..211d74a 100644 --- a/util/ulockmgr_server.c +++ b/util/ulockmgr_server.c @@ -58,7 +58,7 @@ static int receive_message(int sock, void *buf, size_t buflen, int *fdp, { struct msghdr msg; struct iovec iov; - char ccmsg[CMSG_SPACE(sizeof(int)) * MAX_SEND_FDS]; + size_t ccmsg[CMSG_SPACE(sizeof(int) * MAX_SEND_FDS) / sizeof(size_t)]; struct cmsghdr *cmsg; int res; int i; -- cgit v1.2.3