Add basic win support

src/lib/fy-parse.c

@@ -11,12 +11,18 @@
 
 #include <stdio.h>
 #include <string.h>
+#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
 #include <sys/mman.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
+#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
 #include <sys/ioctl.h>
+#endif
 #include <fcntl.h>
+#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
 #include <unistd.h>
+#endif
 #include <assert.h>
 #include <stdlib.h>
 #include <errno.h>

src/lib/fy-token.c

@@ -159,7 +159,7 @@ static int fy_tag_token_format_internal(const struct fy_token *fyt, void *out, s
 	if (out) {
 		outsz = *outszp;
 		o = out;
-		oe = out + outsz;
+		oe = (char *)out + outsz;
 	}
 
 	if (!fyt->tag.fyt_td)
@@ -246,7 +246,7 @@ static int fy_tag_directive_token_format_internal(const struct fy_token *fyt,
 	if (out) {
 		outsz = *outszp;
 		o = out;
-		oe = out + outsz;
+		oe = (char *)out + outsz;
 	}
 
 #define O_CPY(_src, _len) \

src/lib/fy-types.c

@@ -11,11 +11,13 @@
 
 #include <stdio.h>
 #include <string.h>
+#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#endif
 #include <assert.h>
 #include <stdlib.h>
 #include <errno.h>

src/lib/fy-utf8.c

@@ -253,11 +253,11 @@ const void *fy_utf8_memchr_generic(const void *s, int c, size_t n)
 	int cc, w;
 	const void *e;
 
-	e = s + n;
-	while (s < e && (cc = fy_utf8_get(s, e - s, &w)) >= 0) {
+	e = (char*)s + n;
+	while (s < e && (cc = fy_utf8_get(s, (char*)e - (char*)s, &w)) >= 0) {
 		if (c == cc)
 			return s;
-		s += w;
+		s = (char*)s + w;
 	}
 
 	return NULL;

src/lib/fy-utf8.h

@@ -87,7 +87,7 @@ int fy_utf8_get_right_generic(const void *ptr, int left, int *widthp);
 
 static inline int fy_utf8_get_right(const void *ptr, int left, int *widthp)
 {
-	const uint8_t *p = ptr + left;
+	const uint8_t *p = (const uint8_t*)ptr + left;
 
 	/* single byte (hot path) */
 	if (left > 0 && !(p[-1] & 0x80)) {
@@ -194,7 +194,7 @@ static inline const void *fy_utf8_strchr(const void *s, int c)
 
 static inline int fy_utf8_count(const void *ptr, size_t len)
 {
-	const uint8_t *s = ptr, *e = ptr + len;
+	const uint8_t *s = ptr, *e = (const uint8_t *)ptr + len;
 	int w, count;
 
 	count = 0;

src/lib/fy-utils.c

@@ -15,16 +15,101 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
 #include <termios.h>
 #include <unistd.h>
 #include <sys/select.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#elif defined(_MSC_VER)
+#include <windows.h>
+#endif
 
 #include "fy-utf8.h"
 #include "fy-ctype.h"
 #include "fy-utils.h"
 
+int fy_get_pagesize() {
+#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
+       return sysconf(_SC_PAGESIZE);
+#elif defined (_MSC_VER)
+    SYSTEM_INFO si;
+    GetSystemInfo(&si);
+       return si.dwPageSize;
+#endif
+}
+
+#if defined(_MSC_VER)
+#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
+
+int
+vasprintf(char **str, const char *fmt, va_list ap)
+{
+    int ret;
+    va_list ap2;
+    char *string, *newstr;
+    size_t len;
+
+    if ((string = malloc(INIT_SZ)) == NULL)
+        goto fail;
+
+    VA_COPY(ap2, ap);
+    ret = vsnprintf(string, INIT_SZ, fmt, ap2);
+    va_end(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;
+        }
+        VA_COPY(ap2, ap);
+        ret = vsnprintf(newstr, len, fmt, ap2);
+        va_end(ap2);
+        if (ret < 0 || (size_t)ret >= len) { /* failed with realloc'ed string */
+            free(newstr);
+            goto fail;
+        }
+        *str = newstr;
+    }
+    return (ret);
+
+fail:
+    *str = NULL;
+    errno = ENOMEM;
+    return (-1);
+}
+
+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
+
 #if defined(__APPLE__) && (_POSIX_C_SOURCE < 200809L)
 
 /*
@@ -397,6 +482,7 @@ int fy_tag_scan(const char *data, size_t len, struct fy_tag_scan_info *info)
 	return 0;
 }
 
+#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
 /* simple terminal methods; mainly for getting size of terminal */
 int fy_term_set_raw(int fd, struct termios *oldt)
 {
@@ -632,3 +718,4 @@ int fy_term_query_size(int fd, int *rows, int *cols)
 
 	return ret;
 }
+#endif

src/lib/fy-utils.h

@@ -15,13 +15,22 @@
 
 #include <stdio.h>
 #include <stdbool.h>
+#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
 #include <unistd.h>
 #include <termios.h>
+#endif
 
 #if defined(__APPLE__) && (_POSIX_C_SOURCE < 200809L)
 FILE *open_memstream(char **ptr, size_t *sizeloc);
 #endif
 
+int fy_get_pagesize();
+
+#if defined(_MSC_VER)
+int vasprintf(char **strp, const char *fmt, va_list ap);
+int asprintf(char **strp, const char *fmt, ...);
+#endif
+
 int fy_tag_handle_length(const char *data, size_t len);
 bool fy_tag_uri_is_valid(const char *data, size_t len);
 int fy_tag_uri_length(const char *data, size_t len);

src/lib/fy-walk.c

@@ -15,7 +15,9 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
+#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
 #include <unistd.h>
+#endif
 #include <math.h>
 #include <limits.h>