update compatibility fix - remove freopen() and fdopen()

freopen() - with "CON" redirection is broken and output always prints to console window; NULL is not allowed in windows
fdopen() - not works plus stdout is not assignable

so _setmode() is the only option

Author: XakerTwo

generate-cat-file.c

@@ -15,10 +15,6 @@
 	#include <io.h>
 
 	#define IS_WINDOWS
-	
-	#ifdef _O_BINARY
-		#define HAVE_SETMODE
-	#endif
 #endif
 
 
@@ -1290,6 +1286,17 @@ int parse_hwids_arg(char *hwids, struct list_node **hwid)
 
 int main(int argc, char **argv)
 {
+#ifdef IS_WINDOWS
+	#ifdef _O_BINARY
+	if (_setmode(_fileno(stdout), _O_BINARY) == -1)
+	#endif
+	{
+		fatal("cannot set binary mode for stdout\noperation canceled due to translation(known \"corruption\" in text mode)\nhttps://stackoverflow.com/a/5537079");
+	}
+	
+#endif /* IS_WINDOWS */
+	
+	
 	struct pkcs7_toplevel s = { 0 };
 	struct known_oids oids = { 0 };
 
@@ -1405,16 +1412,6 @@ int main(int argc, char **argv)
 	//free(hardware_ids);
 	//hardware_ids = NULL;
 
-#ifdef IS_WINDOWS
-	#ifdef HAVE_SETMODE
-	if (_setmode(_fileno(stdout), _O_BINARY) == -1)
-		fatal("cannot set binary mode for stdout\noutput canceled due to translation(known \"corruption\" in text mode)\nhttps://stackoverflow.com/a/5537079");
-	#else
-	freopen("CON", "wb", stdout);
-	//stdout = fdopen(STDOUT_FILENO, "wb");
-	#endif
-#endif
-	
 	/* and write to stdout or so ... */
 	fwrite(buffer, buflen, 1, stdout);
 	free(buffer); buffer = NULL;

strip-pe-image.c

@@ -9,10 +9,6 @@
 	#include <io.h>
 
 	#define IS_WINDOWS
-
-	#ifdef _O_BINARY
-		#define HAVE_SETMODE
-	#endif
 #endif
 
 char *read_file(const char *fname, long *size_return)
@@ -22,20 +18,21 @@ char *read_file(const char *fname, long *size_return)
 	FILE *f;
 
 #ifdef IS_WINDOWS
-	#ifdef HAVE_SETMODE
+	#ifdef _O_BINARY
 	if (_setmode(_fileno(stdout), _O_BINARY) == -1)
+	#endif
 	{
-		fprintf(stderr, "cannot set binary mode for stdout\noutput canceled due to translation(known \"corruption\" in text mode)\nhttps://stackoverflow.com/a/5537079");
+		fprintf(stderr, "cannot set binary mode for stdout\noperation canceled due to translation(known \"corruption\" in text mode)\nhttps://stackoverflow.com/a/5537079");
 		exit(1);
 	}
-	#else
-	freopen("CON", "wb", stdout);
-	//stdout = fdopen(STDOUT_FILENO, "wb");
-	#endif
 	f = fopen(fname, "rb");
-#else
+
+#else  /* not IS_WINDOWS */
+
 	f = fopen(fname, "r");
-#endif
+
+#endif /* IS_WINDOWS */
+
 
 	if (f == NULL) {
 		perror("opening image file");