Changeset 3266

Timestamp:

May 1, 2007, 5:50:01 PM (18 years ago)

Author:

bird

Message:

Same problem as in zread.c with \r\n -> \n translation screwing up lseek assumptions.

File:

• trunk/essentials/app-shells/bash/input.c (modified) (2 diffs)

trunk/essentials/app-shells/bash/input.c

@@ -446 +446 @@
 {
   ssize_t nr;
+#ifdef __OS2__
+  off_t end, start = bp->b_size > 1 ? lseek (bp->b_fd, 0, SEEK_CUR) : -1;
+#endif 
 
   nr = zread (bp->b_fd, bp->b_buffer, bp->b_size);
   if (nr <= 0)
     {
+#ifdef __OS2__
+l_readerror:
+#endif 
       bp->b_used = 0;
       bp->b_buffer[0] = 0;
@@ -459 +465 @@
     }
 
-#if defined (__CYGWIN__) || defined (__OS2__)
-  /* If on cygwin and OS/2, translate \r\n to \n. */
+#ifdef __OS2__
+  /* \r\n -> \n translation screws us down in sync_buffered_stream,
+     so, we have to check if translation took place and wind back
+     to right before the first one. New line characters are read 
+     one by one. (Same as in zread.c.) */
+  if (start >= 0
+   && (end = lseek (bp->b_fd, 0, SEEK_CUR)) > 0
+   && nr != end - start)
+    {
+      if (bp->b_buffer[0] == '\n')
+        {
+          if (lseek (bp->b_fd, start, SEEK_SET) >= 0)
+            {
+              nr = zread (bp->b_fd, bp->b_buffer, 1);
+              if (nr <= 0)
+                goto l_readerror;
+            }
+        }
+      else
+        {
+          char *nl = memchr (&bp->b_buffer[0], '\n', nr);
+          if (nl != NULL
+           && lseek (bp->b_fd, start + (nl - &bp->b_buffer[0]), SEEK_SET) >= 0)
+              nr = nl - &bp->b_buffer[0];
+        }
+    }
+#endif
+
+#if defined (__CYGWIN__)
+  /* If on cygwin, translate \r\n to \n. */
   if (nr >= 2 && bp->b_buffer[nr - 2] == '\r' && bp->b_buffer[nr - 1] == '\n')
     {