fix to make stdin/stdout options work under Win32

tjko · Apr 11, 2015 · 4e82d0c · 4e82d0c
1 parent a5d36b5
commit 4e82d0c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/jpegoptim.c b/jpegoptim.c
@@ -488,6 +488,7 @@ int main(int argc, char **argv)
   do {
     if (stdin_mode) {
       infile=stdin;
+      set_filemode_binary(infile);
     } else {
       if (!argv[i][0]) continue;
       if (argv[i][0]=='-') continue;
@@ -789,6 +790,7 @@ int main(int argc, char **argv)
 
 	if (stdout_mode) {
 	  outfname=NULL;
+	  set_filemode_binary(stdout);
 	  if (fwrite(outbuffer,outbuffersize,1,stdout) != 1)
 	    fatal("write failed to stdout");
 	} else {

diff --git a/jpegoptim.h b/jpegoptim.h
@@ -20,6 +20,7 @@ extern "C" {
 #include <utime.h>
 #define DIR_SEPARATOR_C '/'
 #define DIR_SEPARATOR_S "/"
+#define set_filemode_binary(file) {}
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/win32_compat.h b/win32_compat.h
@@ -25,6 +25,8 @@ extern "C" {
 #define realpath(N,R) _fullpath((R),(N),MAXPATHLEN)
 #define ftruncate(fildes,length) open(fildes, O_TRUNC|O_WRONLY)
 
+#define set_filemode_binary(file) _setmode(_fileno(file), _O_BINARY)
+
 #define round(x) ((int) (x))
 #define getuid(x) 0
 #define geteuid() 0