Ticket #6705: O_BINARY.diff

src/add-ons/print/transports/parallel_port/ParallelTransport.cpp

@@ -64 +64 @@
     address[size] = 0; // make sure string is 0-terminated
         
     strcat(strcpy(device, "/dev/parallel/"), address);
-    fFile = open(device, O_RDWR | O_EXCL | O_BINARY, 0);
+    fFile = open(device, O_RDWR | O_EXCL, 0);
     if (fFile < 0) {
         // Try unidirectional access mode
         bidirectional = false;
-        fFile = open(device, O_WRONLY | O_EXCL | O_BINARY, 0);
+        fFile = open(device, O_WRONLY | O_EXCL, 0);
     }
 
     if (fFile < 0)

src/add-ons/print/transports/serial_port/SerialTransport.cpp

@@ -64 +64 @@
     address[size] = 0; // make sure string is 0-terminated
         
     strcat(strcpy(device, "/dev/ports/"), address);
-    fFile = open(device, O_RDWR | O_EXCL | O_BINARY, 0);
+    fFile = open(device, O_RDWR | O_EXCL, 0);
     if (fFile < 0) {
         // Try unidirectional access mode
         bidirectional = false;
-        fFile = open(device, O_WRONLY | O_EXCL | O_BINARY, 0);
+        fFile = open(device, O_WRONLY | O_EXCL, 0);
     }
 
     if (fFile < 0)

src/bin/gawk/builtin.c

@@ -1484 +1484 @@
         ret = system(cmd);
         if (ret != -1)
             ret = WEXITSTATUS(ret);
+#ifndef __HAIKU__
         if ((BINMODE & 1) != 0)
             os_setbinmode(fileno(stdin), O_BINARY);
-
+#endif
         cmd[tmp->stlen] = save;
     }
     free_temp(tmp);

src/bin/gawk/io.c

@@ -894 +894 @@
         }
     } else if ((rp->flag & (RED_PIPE|RED_WRITE)) == (RED_PIPE|RED_WRITE)) { /* write to pipe */
         status = pclose(rp->fp);
+#ifndef __HAIKU__
         if ((BINMODE & 1) != 0)
             os_setbinmode(fileno(stdin), O_BINARY);
-
+#endif
         rp->fp = NULL;
     } else if (rp->fp != NULL) {    /* write to file */
         status = fclose(rp->fp);
@@ -1079 +1080 @@
         ret = 0;        /* lint */
         cant_happen();
     }
+#ifndef __HAIKU__
     if (strchr(mode, 'b') != NULL)
         ret |= O_BINARY;
+#endif
     return ret;
 }
 
@@ -2126 +2129 @@
 
     os_restore_mode(fileno(stdin));
     current = popen(cmd, binmode("r"));
+#ifndef __HAIKU__
     if ((BINMODE & 1) != 0)
         os_setbinmode(fileno(stdin), O_BINARY);
+#endif
     if (current == NULL)
         return NULL;
     os_close_on_exec(fileno(current), cmd, "pipe", "from");

src/bin/gawk/main.c

@@ -506 +506 @@
         else    /* PRE_ASSIGN_FS */
             cmdline_fs(preassigns[i].val);
     free(preassigns);
-
+#ifdef O_BINARY
     if ((BINMODE & 1) != 0)
         if (os_setbinmode(fileno(stdin), O_BINARY) == -1)
             fatal(_("can't set binary mode on stdin (%s)"), strerror(errno));
@@ -516 +516 @@
         if (os_setbinmode(fileno(stderr), O_BINARY) == -1)
             fatal(_("can't set binary mode on stderr (%s)"), strerror(errno));
     }
-
+#endif
 #ifdef GAWKDEBUG
     setbuf(stdout, (char *) NULL);  /* make debugging easier */
 #endif

headers/posix/fcntl.h

@@ -48 +48 @@
 #define O_NONBLOCK      0x00000080  /* non blocking io */
 #define O_NDELAY        O_NONBLOCK
 #define O_APPEND        0x00000800  /* to end of file */
-#define O_TEXT          0x00004000  /* CR-LF translation */
-#define O_BINARY        0x00008000  /* no translation */
 #define O_SYNC          0x00010000  /* write synchronized I/O file integrity */
 #define O_RSYNC         0x00020000  /* read synchronized I/O file integrity */
 #define O_DSYNC         0x00040000  /* write synchronized I/O data integrity */