Fix c4ls_buffer and reading from stdin file "-" on windows

3 files changed, 6 insertions, 2 deletions

diff --git a/src/cc4group.c b/src/cc4group.c
index e0ba55e..e126984 100644
--- a/src/cc4group.c
+++ b/src/cc4group.c
@@ -1057,6 +1057,7 @@ static bool cc4group_openExisting(CC4Group* const this, const char* const path)
 
 	if(strcmp(path, "-") == 0)
 	{
+		SET_BINARY(STDIN_FILENO);
 		return cc4group_openFd(this, STDIN_FILENO);
 	}
 
diff --git a/src/cc4group.h b/src/cc4group.h
index 5031e95..cc04a4f 100644
--- a/src/cc4group.h
+++ b/src/cc4group.h
@@ -53,11 +53,11 @@ typedef struct {
 	bool (*openMemory)(CC4Group* const this, const void* const groupData, size_t const size, int const memoryManagement);
 
 	// opens a group through a file descriptor
-	// the file descriptor must have been opened with read access
+	// the file descriptor must have been opened with read access; also be aware that the file must be opened with binary mode on windows
 	bool (*openFd)(CC4Group* const this, int fd);
 
 	// opens a group through a FILE*
-	// the file must have been opened with read access
+	// the file must have been opened with read access; also be aware that the file must be opened with binary mode on windows
 	bool (*openFilePointer)(CC4Group* const this, FILE* fd);
 
 	// opens a group and calls the callback to get the group data
diff --git a/src/platform/platform.h b/src/platform/platform.h
index aaa6138..8e52d51 100644
--- a/src/platform/platform.h
+++ b/src/platform/platform.h
@@ -4,6 +4,7 @@
 #include <sys/types.h>
 
 #ifdef CC4GROUP_PLATFORM_WINDOWS
+	#include <fcntl.h>
 	#define PROT_READ     0x1
 	#define PROT_WRITE    0x2
 	/* This flag is only available in WinXP+ */
@@ -21,11 +22,13 @@
 	#define MAP_FAILED    ((void *) -1)
 
 	#define cc4group_mkdir(path, mode) mkdir((path))
+	#define SET_BINARY(fd) setmode(fd, O_BINARY)
 #else
 	#include <sys/mman.h>
 
 	#define cc4group_mkdir(path, mode) mkdir((path), (mode))
 	#define O_BINARY 0
+	#define SET_BINARY(fd)
 #endif
 
 void *cc4group_mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset, void** extra);