diff options
author | Miklos Szeredi <miklos@szeredi.hu> | 2007-01-19 22:11:40 +0000 |
---|---|---|
committer | Miklos Szeredi <miklos@szeredi.hu> | 2007-01-19 22:11:40 +0000 |
commit | 6e7d018049193efe9d092bb91c4416a332f28278 (patch) | |
tree | 1682fdb3dc3d9ca6012e3e4813b6203401ec6d0c /util/fusermount.c | |
parent | 7dcdf1bf5b4c9fe36bf6fdf98149154a3216f059 (diff) |
merge up to fuse_2_6_merge1
Diffstat (limited to 'util/fusermount.c')
-rw-r--r-- | util/fusermount.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |