#include <stdlib.h>
#include <assert.h>
#include <stdint.h>
+#include <stdio.h>
#include <catta/log.h>
{
static char buf[256];
+ int err = WSAGetLastError();
+ int len = snprintf(buf, sizeof(buf), "[%i] ", err);
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL, WSAGetLastError(), 0, buf, sizeof(buf), NULL);
+ NULL, err, 0, buf + len, sizeof(buf) - len, NULL);
return buf;
}
int ioctl(int d, unsigned long request, int *p)
{
- u_long arg = 0;
+ u_long arg = *p;
if(ioctlsocket(d, request, &arg) == SOCKET_ERROR) {
errno = wsa_errno();
int pipe(int pipefd[2])
{
- int lsock = INVALID_SOCKET;
+ int lsock = (int)INVALID_SOCKET;
struct sockaddr_in laddr;
socklen_t laddrlen = sizeof(laddr);
- pipefd[0] = pipefd[1] = INVALID_SOCKET;
+ pipefd[0] = pipefd[1] = (int)INVALID_SOCKET;
// bind a listening socket to a TCP port on localhost
laddr.sin_family = AF_INET;
strncpy(buf->version, "unknown", sizeof(buf->sysname)-1); // we don't need it
// computer (node) name
- if(GetComputerName(buf->nodename, sizeof(buf->nodename)-1) == 0) {
+ DWORD nodename_size = sizeof(buf->nodename)-1;
+ if(GetComputerName(buf->nodename, &nodename_size) == 0) {
errno = EFAULT;
return -1;
}