lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2026-03-10 00:20:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows portability fixes

Browse Source
This commit is contained in:
Evan Miller
2020-08-05 00:20:59 -04:00
parent bcc6defe94
commit 6771014c49
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/mdbfakeglib.h
View File

@@ -5,6 +5,13 @@
#include <locale.h> #include <locale.h>
#include <inttypes.h> #include <inttypes.h>
// for ntohl
#ifdef _WIN32
#include <winsock.h>
#else
#include <arpa/inet.h>
#endif
typedef uint16_t guint16; typedef uint16_t guint16;
typedef uint32_t guint32; typedef uint32_t guint32;
typedef uint64_t guint64; typedef uint64_t guint64;

12
src/libmdb/fakeglib.c
View File

@@ -34,7 +34,13 @@ char **g_strsplit(const char *haystack, const char *needle, int something) {
int i = 0; int i = 0;
while ((found = strstr(haystack, needle))) { while ((found = strstr(haystack, needle))) {
ret[i++] = strndup(haystack, found - haystack); // Windows lacks strndup
size_t chunk_len = found - haystack;
char *chunk = malloc(chunk_len + 1);
memcpy(chunk, haystack, chunk_len);
chunk[chunk_len] = 0;
ret[i++] = chunk;
haystack = found + strlen(needle); haystack = found + strlen(needle);
} }
ret[i] = strdup(haystack); ret[i] = strdup(haystack);
@@ -65,11 +71,11 @@ char *g_strconcat(const char *first, ...) {
ret = malloc(len+1); ret = malloc(len+1);
char *pos = stpcpy(ret, first); char *pos = strcpy(ret, first) + strlen(first);
va_start(argp, first); va_start(argp, first);
while ((arg = va_arg(argp, char *))) { while ((arg = va_arg(argp, char *))) {
pos = stpcpy(pos, arg); pos = strcpy(pos, arg) + strlen(arg);
} }
va_end(argp); va_end(argp);