Changeset 1806 in kBuild

Timestamp:

Oct 9, 2008 5:34:29 AM (16 years ago)

Author:

bird

Message:

kmk: readstring - use memchr.

File:

• trunk/src/kmk/read.c (modified) (3 diffs)

trunk/src/kmk/read.c

@@ -2803 +2803 @@
 {
   char *eol;
+#ifdef KMK
+  char *end;
+#endif
 
   /* If there is nothing left in this buffer, return 0.  */
@@ -2812 +2815 @@
 
   eol = ebuf->buffer = ebuf->bufnext;
+#ifdef KMK
+  end = ebuf->bufstart + ebuf->size;
+#endif
 
   while (1)
@@ -2820 +2826 @@
 
       /* Find the next newline.  At EOS, stop.  */
+#ifndef KMK
       eol = p = strchr (eol , '\n');
+#else
+      p = (char *)memchr (eol, '\n', end - eol);
+      assert (!memchr (eol, '\0', p != 0 ? p - eol : end - eol));
+      eol = p;
+#endif
       if (!eol)
         {
+
           ebuf->bufnext = ebuf->bufstart + ebuf->size + 1;
           return 0;