Changeset 3261

Timestamp:

May 1, 2007, 4:25:11 PM (18 years ago)

Author:

bird

Message:

Fixed an issue with lseek and \r\n -> \n translation.

File:

• trunk/essentials/app-shells/bash/lib/sh/zread.c (modified) (2 diffs)

trunk/essentials/app-shells/bash/lib/sh/zread.c

@@ -98 +98 @@
   if (lind == lused || lused == 0)
     {
+#ifdef __OS2__
+      off_t end, start = lseek (fd, 0, SEEK_CUR);
+#endif 
       nr = zread (fd, lbuf, sizeof (lbuf));
       lind = 0;
@@ -105 +108 @@
           return nr;
         }
+#ifdef __OS2__
+      /* \r\n -> \n translation screws us down in zsyncfd, 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. */
+      if (start >= 0
+       && (end = lseek (fd, 0, SEEK_CUR)) > 0
+       && nr != end - start)
+        {
+          if (lbuf[0] == '\n')
+            {
+              if (lseek (fd, start, SEEK_SET) >= 0)
+                {
+                  nr = zread (fd, lbuf, 1);
+                  lind = 0;
+                  if (nr <= 0)
+                    {
+                      lused = 0;
+                      return nr;
+                    }
+                }
+            }
+          else
+            {
+              char *nl = memchr (&lbuf[0], '\n', nr);
+              if (nl != NULL
+               && lseek (fd, start + (nl - &lbuf[0]), SEEK_SET) >= 0)
+                  nr = nl - &lbuf[0];
+            }
+        }
+#endif
       lused = nr;
     }