Add the "b" back to files opens for WIN32 builds as I am fairly sure it was

required.

Fix the remain rb and wb cases that were missed.

diff --git a/elf2flt.c b/elf2flt.c
index 1ed498cb904eb6420d0f5205e89d1200b03c8d16..cff6cb3fc9168f477198957b0a00151e45d59c0c 100644 (file)
--- a/elf2flt.c
+++ b/elf2flt.c
@@ -44,8 +44,10 @@
 #include <time.h>
 #ifndef WIN32
 #include <netinet/in.h> /* Consts and structs defined by the internet system */
+#define        BINARY_FILE_OPTS
 #else
 #include <winsock2.h>
+#define        BINARY_FILE_OPTS "b"
 #endif
 
 /* from $(INSTALLDIR)/include       */
@@ -2197,7 +2199,7 @@ int main(int argc, char *argv[])
                                pclose(gf); \
                        else \
                                fclose(gf); \
-               if (!(gf = popen(cmd, "wb"))) { \
+               if (!(gf = popen(cmd, "w" BINARY_FILE_OPTS))) { \
                        fprintf(stderr, "Can't run cmd %s\n", cmd); \
                        exit(4); \
                } \

diff --git a/flthdr.c b/flthdr.c
index 9bb03587f1e9f32c008216644d5bf9b6ea57c6b6..967d64063a5cc29a7ed3f8b5d9fabf85943fcafc 100644 (file)
--- a/flthdr.c
+++ b/flthdr.c
@@ -19,8 +19,10 @@
 /* macros for conversion between host and (internet) network byte order */
 #ifndef WIN32
 #include <netinet/in.h> /* Consts and structs defined by the internet system */
+#define        BINARY_FILE_OPTS
 #else
 #include <winsock2.h>
+#define        BINARY_FILE_OPTS "b"
 #endif
 
 /* from uClinux-x.x.x/include/linux */
@@ -83,7 +85,7 @@ process_file(char *ifile, char *ofile)
 
        *tfile = *tfile2 = '\0';
 
-       if ((ifp = fopen(ifile, "rb")) == NULL) {
+       if ((ifp = fopen(ifile, "r" BINARY_FILE_OPTS)) == NULL) {
                fprintf(stderr, "Cannot open %s\n", ifile);
                return;
        }
@@ -206,7 +208,7 @@ process_file(char *ifile, char *ofile)
 
        strcpy(tfile, "/tmp/flatXXXXXX");
        mkstemp(tfile);
-       if ((ofp = fopen(tfile, "wb")) == NULL) {
+       if ((ofp = fopen(tfile, "w" BINARY_FILE_OPTS)) == NULL) {
                fprintf(stderr, "Failed to open %s for writing\n", tfile);
                unlink(tfile);
                unlink(tfile2);
@@ -231,7 +233,7 @@ process_file(char *ifile, char *ofile)
                mkstemp(tfile2);
                
                if (old_flags & FLAT_FLAG_GZDATA) {
-                       tfp = fopen(tfile2, "wb");
+                       tfp = fopen(tfile2, "w" BINARY_FILE_OPTS);
                        if (!tfp) {
                                fprintf(stderr, "Failed to open %s for writing\n", tfile2);
                                exit(1);
@@ -242,7 +244,7 @@ process_file(char *ifile, char *ofile)
                }
 
                sprintf(cmd, "gunzip >> %s", tfile2);
-               tfp = popen(cmd, "w");
+               tfp = popen(cmd, "w" BINARY_FILE_OPTS);
                if(!tfp) {
                        perror("popen");
                        exit(1);
@@ -251,7 +253,7 @@ process_file(char *ifile, char *ofile)
                pclose(tfp);
 
                fclose(ifp);
-               ifp = fopen(tfile2, "rb");
+               ifp = fopen(tfile2, "r" BINARY_FILE_OPTS);
                if (!ifp) {
                        fprintf(stderr, "Failed to open %s for reading\n", tfile2);
                        unlink(tfile);
@@ -264,7 +266,7 @@ process_file(char *ifile, char *ofile)
                printf("zflat %s --> %s\n", ifile, ofile);
                fclose(ofp);
                sprintf(cmd, "gzip -9 -f >> %s", tfile);
-               ofp = popen(cmd, "w");
+               ofp = popen(cmd, "w" BINARY_FILE_OPTS);
                ofp_is_pipe = 1;
        } else if (new_flags & FLAT_FLAG_GZDATA) {
                printf("zflat-data %s --> %s\n", ifile, ofile);
@@ -272,7 +274,7 @@ process_file(char *ifile, char *ofile)
                                sizeof(struct flat_hdr));
                fclose(ofp);
                sprintf(cmd, "gzip -9 -f >> %s", tfile);
-               ofp = popen(cmd, "w");
+               ofp = popen(cmd, "w" BINARY_FILE_OPTS);
                ofp_is_pipe = 1;
        }