Open files in binary mode to convert DOS to Unix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/unix2dos.c b/distrib/msw/unix2dos.c
index 46d27a0f7a120556a231d13d27794dddebb4c071..f725b9ee51dfaffb4f2ee2993cb7585c9a061a2c 100644 (file)
--- a/distrib/msw/unix2dos.c
+++ b/distrib/msw/unix2dos.c
@@ -69,14 +69,14 @@ main(int argc, char *argv[])
             char tmpFile[512];
             sprintf(tmpFile, "%s.tmp", argv[i]);
             
             char tmpFile[512];
             sprintf(tmpFile, "%s.tmp", argv[i]);
             

-            fp = fopen(argv[i], "r");
+            fp = fopen(argv[i], "rb");

             if (!fp)
             {
                 fprintf(stderr, "Cannot open %s.\n", argv[i]);
                 i ++;
                 continue;
             }
             if (!fp)
             {
                 fprintf(stderr, "Cannot open %s.\n", argv[i]);
                 i ++;
                 continue;
             }

-            outFile = fopen(tmpFile, "w");
+            outFile = fopen(tmpFile, "wb");

             if (!outFile)
             {
                 fprintf(stderr, "Cannot open %s.\n", tmpFile);
             if (!outFile)
             {
                 fprintf(stderr, "Cannot open %s.\n", tmpFile);


@@ -112,20 +112,28 @@ void translate(FILE *ifp, FILE *ofp, int unix2Dos)
     int c,d;
     
     if (!unix2Dos)
     int c,d;
     
     if (!unix2Dos)

+    {

         /* DOS2Unix */
         /* DOS2Unix */

-        while ((c = getc(ifp)) != EOF){
+        while ((c = getc(ifp)) != EOF)
+        {

             if (c == CR)
             if (c == CR)

-                switch(d = getc(ifp)){ /* check to see if LF follows */
-    case LF:
-        putc(d,ofp);         /* if so, ignore CR */
-        break;
-    default:
-        putc(c,ofp);         /* if not, output CR and following char */
-        putc(d,ofp);
-            }   else putc(c, ofp); /* c is not a CR */
+            {
+                switch(d = getc(ifp))
+                { /* check to see if LF follows */
+                    case LF:
+                        putc(d,ofp);         /* if so, ignore CR */
+                        break;
+                    default:
+                        putc(c,ofp);         /* if not, output CR and following char */
+                        putc(d,ofp);
+                }
+            }
+            else
+                putc(c, ofp); /* c is not a CR */

         }
         }

-        
-        else
+     }
+     else
+        {

             /* Unix2DOS */
             while ((c = getc(ifp)) != EOF){
                 if (c == CR)
             /* Unix2DOS */
             while ((c = getc(ifp)) != EOF){
                 if (c == CR)


@@ -134,6 +142,7 @@ void translate(FILE *ifp, FILE *ofp, int unix2Dos)
                     putc(CR, ofp); /* add CR before each LF */
                 putc(c, ofp);
             }
                     putc(CR, ofp); /* add CR before each LF */
                 putc(c, ofp);
             }

+        }

 }
 
 void usage()
 }
 
 void usage()