mingw32

Author: artygus

.gitignore

@@ -4,6 +4,7 @@
 *.la
 .deps
 .libs
+*.exe
 src/ios_webkit_debug_proxy
 examples/dl_client
 examples/wi_client

configure.ac

@@ -41,9 +41,34 @@ AC_TYPE_UINT64_T
 AC_TYPE_UINT8_T
 
 # Checks for library functions.
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_CHECK_FUNCS([memmove memset regcomp select socket stpcpy strcasecmp strncasecmp strchr strdup strndup strrchr strstr strtol])
+AC_CHECK_FUNCS([malloc realloc memmove memset regcomp select socket stpcpy strcasecmp strncasecmp strchr strdup strndup strrchr strstr strtol strcasestr va_copy vasprintf asprintf stpncpy stpcpy strndup getline htobe64])
+
+# Check for pcre presence if regex.h is absent
+AC_CHECK_HEADER(regex.h, [ac_have_regex_h="yes"], [ac_have_regex_h="no"])
+if test "x$ac_have_regex_h" = "xno"; then
+  PKG_CHECK_MODULES(libpcreposix, libpcreposix, [], [AC_MSG_ERROR([Neither regex.h nor pcre headers were found])])
+else
+  AC_DEFINE(HAVE_REGEX_H, 1, [regex.h is present])
+fi
+
+# Check for operating system
+AC_MSG_CHECKING([whether to enable WIN32 build settings])
+case ${host_os} in
+  *mingw32*|*cygwin*)
+    win32=true
+    AC_MSG_RESULT([yes])
+    AC_DEFINE(WIN32_LEAN_AND_MEAN, 1, [Define to limit the scope of windows.h])
+    AC_DEFINE(__USE_MINGW_ANSI_STDIO, 1, [Define to use C99 printf/snprintf in MinGW])
+    ;;
+  *)
+    win32=false
+    AC_MSG_RESULT([no])
+    ;;
+esac
+AM_CONDITIONAL(WIN32, test x$win32 = xtrue)
+
+# Check endianess
+AC_C_BIGENDIAN
 
 AC_CONFIG_FILES([Makefile src/Makefile include/Makefile examples/Makefile])
 

examples/dl_client.c

@@ -9,7 +9,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#include <winsock2.h>
+#else
 #include <sys/socket.h>
+#endif
 #include <unistd.h>
 
 #include "device_listener.h"

examples/wi_client.c

@@ -11,7 +11,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#include <winsock2.h>
+#else
 #include <sys/socket.h>
+#endif
 #include <unistd.h>
 
 #include "webinspector.h"
@@ -121,7 +127,11 @@ int main(int argc, char **argv) {
   size_t buf_length = 1024;
   while (!quit_flag) {
     ssize_t read_bytes = recv(fd, buf, buf_length, 0);
+#ifndef WIN32
     if (read_bytes < 0 && errno == EWOULDBLOCK) {
+#else
+    if (read_bytes && WSAGetLastError() != WSAEWOULDBLOCK) {
+#endif
       continue;
     }
     if (wi->on_recv(wi, buf, read_bytes)) {

examples/ws_echo1.c

@@ -12,16 +12,29 @@
 #include "ws_echo_common.h"
 #include "websocket.h"
 
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#include <winsock2.h>
+#else
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#endif
 #include <errno.h>
 #include <unistd.h>
 
 #define BUF_LEN 1024
 #define PORT 8080
 
 int main(int argc, char** argv) {
+#ifdef WIN32
+  WSADATA wsa_data;
+  if (WSAStartup(MAKEWORD(2,2), &wsa_data) != ERROR_SUCCESS) {
+    fprintf(stderr, "WSAStartup failed!\n");
+    ExitProcess(-1);
+  }
+#endif
   int port = PORT;
 
   int sfd = socket(AF_INET, SOCK_STREAM, 0);
@@ -38,7 +51,11 @@ int main(int argc, char** argv) {
       bind(sfd, (struct sockaddr*)&local, sizeof(local)) < 0 ||
       listen(sfd, 1)) {
     perror("Unable to bind");
+#ifndef WIN32
     close(sfd);
+#else
+    closesocket(sfd);
+#endif
     return -1;
   }
 

examples/ws_echo2.c

@@ -12,8 +12,14 @@
 #include <string.h>
 #include <assert.h>
 
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#include <winsock2.h>
+#else
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#endif
 #include <errno.h>
 
 #include "socket_manager.h"

examples/ws_echo_common.c

@@ -10,11 +10,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#include <winsock2.h>
+#else
 #include <sys/socket.h>
+#endif
 
 #include "ws_echo_common.h"
 #include "websocket.h"
-
+#include "asprintf.h"
 
 // websocket callbacks:
 

include/asprintf.h

@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2004 Darren Tucker.
+ *
+ * Based originally on asprintf.c from OpenBSD:
+ * Copyright (c) 1997 Todd C. Miller <[email protected]>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __ASPRINTF_H
+#define __ASPRINTF_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdarg.h>
+#include <limits.h>
+
+#ifndef HAVE_VASPRINTF
+
+#ifndef VA_COPY
+# ifdef HAVE_VA_COPY
+#  define VA_COPY(dest, src) va_copy(dest, src)
+# else
+#  ifdef HAVE___VA_COPY
+#   define VA_COPY(dest, src) __va_copy(dest, src)
+#  else
+#   define VA_COPY(dest, src) (dest) = (src)
+#  endif
+# endif
+#endif
+
+#define INIT_SZ 128
+
+static inline int vasprintf(char **str, const char *fmt, va_list ap)
+{
+  int ret = -1;
+  va_list ap2;
+  char *string, *newstr;
+  size_t len;
+
+  VA_COPY(ap2, ap);
+  if ((string = malloc(INIT_SZ)) == NULL)
+    goto fail;
+
+  ret = vsnprintf(string, INIT_SZ, fmt, ap2);
+  if (ret >= 0 && ret < INIT_SZ) { /* succeeded with initial alloc */
+    *str = string;
+  } else if (ret == INT_MAX || ret < 0) { /* Bad length */
+    free(string);
+    goto fail;
+  } else {  /* bigger than initial, realloc allowing for nul */
+    len = (size_t)ret + 1;
+    if ((newstr = realloc(string, len)) == NULL) {
+      free(string);
+      goto fail;
+    } else {
+      va_end(ap2);
+      VA_COPY(ap2, ap);
+      ret = vsnprintf(newstr, len, fmt, ap2);
+      if (ret >= 0 && (size_t)ret < len) {
+        *str = newstr;
+      } else { /* failed with realloc'ed string, give up */
+        free(newstr);
+        goto fail;
+      }
+    }
+  }
+  va_end(ap2);
+  return (ret);
+
+fail:
+  *str = NULL;
+  va_end(ap2);
+  return (-1);
+}
+#endif
+
+#ifndef HAVE_ASPRINTF
+static inline int asprintf(char **str, const char *fmt, ...)
+{
+  va_list ap;
+  int ret;
+
+  *str = NULL;
+  va_start(ap, fmt);
+  ret = vasprintf(str, fmt, ap);
+  va_end(ap);
+
+  return ret;
+}
+#endif
+
+#endif

include/getline.h

@@ -0,0 +1,53 @@
+/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef __GETLINE_H
+#define __GETLINE_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef HAVE_GETLINE
+static inline int getline(char **lineptr, size_t *n, FILE *stream)
+{
+  if (lineptr == NULL || n == NULL)
+  {
+    return -1;
+  }
+  if (*lineptr == NULL || *n == 0)
+  {
+    *n = 120;
+    *lineptr = (char *) malloc (*n);
+    if (*lineptr == NULL)
+    {
+      return -1;
+    }
+  }
+  if (fgets (*lineptr, *n, stream))
+    return *n;
+  else
+    return -1;
+}
+#endif
+
+#endif

include/rpc.h

@@ -13,6 +13,7 @@ extern "C" {
 #endif
 
 #include <plist/plist.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>