From: Sascha Schumann <sas@php.net>
Date: Wed, 25 Jul 2001 21:06:01 +0000 (+0000)
Subject: Get rid of memchr in SEARCHCR().
X-Git-Tag: PRE_TSRM_MERGE_PATCH~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d256fbf2b808054e687cf8ec14d4c4a327f543cf;p=php

Get rid of memchr in SEARCHCR().
---

diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index a4f5148b5a..0cf92a2ad6 100644
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -89,8 +89,10 @@ extern int le_fp;
 		efree(key);				\
 	}
 
-#define SEARCHCR() \
-	p = memchr(READPTR(sock), '\n', MIN(TOREAD(sock), maxlen));
+#define SEARCHCR() do {											\
+	for (p = READPTR(sock), pe = p + MIN(TOREAD(sock), maxlen); \
+			*p != '\n'; ) if (++p >= pe) { p = NULL; break; }	\
+} while (0)
 
 #ifdef PHP_WIN32
 #define EWOULDBLOCK WSAEWOULDBLOCK
@@ -540,7 +542,7 @@ PHPAPI void php_sockset_timeout(int socket, struct timeval *timeout)
  */
 static char * php_sock_fgets_internal(char * buf, size_t maxlen, php_sockbuf * sock)
 {
-	char *p = NULL;
+	char *p = NULL, *pe;
 	char *ret = NULL;
 	size_t amount = 0;