Update headers for Haiku OS compatibility.

Haiku OS defines "B_ERROR" as a macro, so I renamed the bstream_flags
enum values to start with "BST_" instead of "B_", which should be
slightly more memorable as well as not conflicting with BeOS errors.

I also added #include <fcntl.h> to a common bash header file so that
mkbuiltins.cc can find open() on Solaris 10.

Author: jhamby

bashtypes.hh

@@ -33,6 +33,15 @@
 #include <stdint.h>
 #endif
 
+// Include and undefine the Gnulib macros that break (at least) Haiku OS.
+#include <stdlib.h>
+#ifdef strtoll
+#undef strtoll
+#endif
+#ifdef strtoull
+#undef strtoull
+#endif
+
 // Undefine gnulib's static_assert macro from "assert.h",
 // which breaks the system C++ headers on MINIX and Solaris.
 #ifdef static_assert

error.cc

@@ -21,10 +21,7 @@
 #include "config.h"
 
 #include <fcntl.h>
-
-#if defined(HAVE_UNISTD_H)
 #include <unistd.h>
-#endif
 
 #include <cstdarg>
 

include/posixstat.hh

@@ -24,6 +24,7 @@
 #if !defined(_POSIXSTAT_H_)
 #define _POSIXSTAT_H_
 
+#include <fcntl.h>
 #include <sys/stat.h>
 
 #if defined(STAT_MACROS_BROKEN)

input.cc

@@ -130,11 +130,11 @@ Shell::make_buffered_stream (int fd, char *buffer, size_t bufsize)
   bp->b_fd = fd;
   bp->b_buffer = buffer;
   bp->b_size = bufsize;
-  bp->b_used = bp->b_inputp = bp->b_flag = B_NOFLAGS;
+  bp->b_used = bp->b_inputp = bp->b_flag = BST_NOFLAGS;
   if (bufsize == 1)
-    bp->b_flag |= B_UNBUFF;
+    bp->b_flag |= BST_UNBUFF;
   if (O_TEXT && (::fcntl (fd, F_GETFL) & O_TEXT) != 0)
-    bp->b_flag |= B_TEXT;
+    bp->b_flag |= BST_TEXT;
   return bp;
 }
 
@@ -172,7 +172,7 @@ Shell::save_bash_input (int fd, int new_fd)
          descriptor?  Free up the buffer and report the error. */
       internal_error (
           _ ("save_bash_input: buffer already exists for new fd %d"), nfd);
-      if (buffers[snfd]->b_flag & B_SHAREDBUF)
+      if (buffers[snfd]->b_flag & BST_SHAREDBUF)
         buffers[snfd]->b_buffer = nullptr;
       free_buffered_stream (buffers[snfd]);
     }
@@ -256,7 +256,7 @@ Shell::duplicate_buffered_stream (int fd1, int fd2)
           && buffers[sfd1]->b_buffer == buffers[sfd2]->b_buffer)
         buffers[sfd2] = nullptr;
       /* If this buffer is shared with another fd, don't free the buffer */
-      else if (buffers[sfd2]->b_flag & B_SHAREDBUF)
+      else if (buffers[sfd2]->b_flag & BST_SHAREDBUF)
         {
           buffers[sfd2]->b_buffer = nullptr;
           free_buffered_stream (buffers[sfd2]);
@@ -272,12 +272,12 @@ Shell::duplicate_buffered_stream (int fd1, int fd2)
     {
       if (!buffers[sfd2])
         fd_to_buffered_stream (fd2);
-      buffers[sfd2]->b_flag |= B_WASBASHINPUT;
+      buffers[sfd2]->b_flag |= BST_WASBASHINPUT;
     }
 
   if (fd_is_bash_input (fd1)
-      || (buffers[sfd1] && (buffers[sfd1]->b_flag & B_SHAREDBUF)))
-    buffers[sfd2]->b_flag |= B_SHAREDBUF;
+      || (buffers[sfd1] && (buffers[sfd1]->b_flag & BST_SHAREDBUF)))
+    buffers[sfd2]->b_flag |= BST_SHAREDBUF;
 
   return fd2;
 }
@@ -323,14 +323,14 @@ Shell::b_fill_buffer (BUFFERED_STREAM *bp)
      compensate for lseek() on text files returning an offset different from
      the count of characters read() returns.  Text-mode streams have to be
      treated as unbuffered. */
-  if ((bp->b_flag & (B_TEXT | B_UNBUFF)) == B_TEXT)
+  if ((bp->b_flag & (BST_TEXT | BST_UNBUFF)) == BST_TEXT)
     {
       o = lseek (bp->b_fd, 0, SEEK_CUR);
       nr = zread (bp->b_fd, bp->b_buffer, bp->b_size);
       if (nr > 0 && nr < lseek (bp->b_fd, 0, SEEK_CUR) - o)
         {
           lseek (bp->b_fd, o, SEEK_SET);
-          bp->b_flag |= B_UNBUFF;
+          bp->b_flag |= BST_UNBUFF;
           bp->b_size = 1;
           nr = zread (bp->b_fd, bp->b_buffer, bp->b_size);
         }
@@ -342,9 +342,9 @@ Shell::b_fill_buffer (BUFFERED_STREAM *bp)
       bp->b_used = bp->b_inputp = 0;
       bp->b_buffer[0] = 0;
       if (nr == 0)
-        bp->b_flag |= B_EOF;
+        bp->b_flag |= BST_EOF;
       else
-        bp->b_flag |= B_ERROR;
+        bp->b_flag |= BST_ERROR;
       return EOF;
     }
 

input.hh

@@ -42,13 +42,13 @@ enum stream_type
 /* Possible values for b_flag. */
 enum bstream_flags
 {
-  B_NOFLAGS = 0,
-  B_EOF = 0x01,
-  B_ERROR = 0x02,
-  B_UNBUFF = 0x04,
-  B_WASBASHINPUT = 0x08,
-  B_TEXT = 0x10,
-  B_SHAREDBUF = 0x20 /* shared input buffer */
+  BST_NOFLAGS = 0,
+  BST_EOF = 0x01,
+  BST_ERROR = 0x02,
+  BST_UNBUFF = 0x04,
+  BST_WASBASHINPUT = 0x08,
+  BST_TEXT = 0x10,
+  BST_SHAREDBUF = 0x20 /* shared input buffer */
 };
 
 static inline bstream_flags &

shell.hh

@@ -2987,7 +2987,7 @@ protected:
       return 0;
 
     int fd = bp->b_fd;
-    if (bp->b_flag & B_SHAREDBUF)
+    if (bp->b_flag & BST_SHAREDBUF)
       bp->b_buffer = nullptr;
     free_buffered_stream (bp);
     return close (fd);