ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix whitespace damage in compatfd 

Spotted by malc.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5333 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2008-09-27 20:41:11 +00:00
parent cc6747f4c9
commit b8ae75538e
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
compatfd.c
View File

@ -33,35 +33,35 @@ static void *sigwait_compat(void *opaque)
sigprocmask(SIG_BLOCK, &all, NULL); sigprocmask(SIG_BLOCK, &all, NULL);
do { do {
siginfo_t siginfo; siginfo_t siginfo;
err = sigwaitinfo(&info->mask, &siginfo); err = sigwaitinfo(&info->mask, &siginfo);
if (err == -1 && errno == EINTR) { if (err == -1 && errno == EINTR) {
err = 0; err = 0;
continue; continue;
} }
if (err > 0) { if (err > 0) {
char buffer[128]; char buffer[128];
size_t offset = 0; size_t offset = 0;
memcpy(buffer, &err, sizeof(err)); memcpy(buffer, &err, sizeof(err));
while (offset < sizeof(buffer)) { while (offset < sizeof(buffer)) {
ssize_t len; ssize_t len;
len = write(info->fd, buffer + offset, len = write(info->fd, buffer + offset,
sizeof(buffer) - offset); sizeof(buffer) - offset);
if (len == -1 && errno == EINTR) if (len == -1 && errno == EINTR)
continue; continue;
if (len <= 0) { if (len <= 0) {
err = -1; err = -1;
break; break;
} }
offset += len; offset += len;
} }
} }
} while (err >= 0); } while (err >= 0);
return NULL; return NULL;
@ -76,13 +76,13 @@ static int qemu_signalfd_compat(const sigset_t *mask)
info = malloc(sizeof(*info)); info = malloc(sizeof(*info));
if (info == NULL) { if (info == NULL) {
errno = ENOMEM; errno = ENOMEM;
return -1; return -1;
} }
if (pipe(fds) == -1) { if (pipe(fds) == -1) {
free(info); free(info);
return -1; return -1;
} }
memcpy(&info->mask, mask, sizeof(*mask)); memcpy(&info->mask, mask, sizeof(*mask));
@ -105,7 +105,7 @@ int qemu_signalfd(const sigset_t *mask)
ret = syscall(SYS_signalfd, -1, mask, _NSIG / 8); ret = syscall(SYS_signalfd, -1, mask, _NSIG / 8);
if (!(ret == -1 && errno == ENOSYS)) if (!(ret == -1 && errno == ENOSYS))
return ret; return ret;
#endif #endif
return qemu_signalfd_compat(mask); return qemu_signalfd_compat(mask);
@ -118,10 +118,10 @@ int qemu_eventfd(int *fds)
ret = syscall(SYS_eventfd, 0); ret = syscall(SYS_eventfd, 0);
if (ret >= 0) { if (ret >= 0) {
fds[0] = fds[1] = ret; fds[0] = fds[1] = ret;
return 0; return 0;
} else if (!(ret == -1 && errno == ENOSYS)) } else if (!(ret == -1 && errno == ENOSYS))
return ret; return ret;
#endif #endif
return pipe(fds); return pipe(fds);