cvs: php4 /ext/standard fsock.c
| From: | Sascha Schumann | Date: | Wed, 25 Jul 2001 21:06:03 +0000 |
| Subject: | cvs: php4 /ext/standard fsock.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6347@lists.php.net to get a copy of this message | ||
sas Wed Jul 25 17:06:03 2001 EDT
Modified files:
/php4/ext/standard fsock.c
Log:
Get rid of memchr in SEARCHCR().
Index: php4/ext/standard/fsock.c
diff -u php4/ext/standard/fsock.c:1.70 php4/ext/standard/fsock.c:1.71
--- php4/ext/standard/fsock.c:1.70 Wed Jun 6 09:05:51 2001
+++ php4/ext/standard/fsock.c Wed Jul 25 17:06:01 2001
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.70 2001/06/06 13:05:51 rasmus Exp $ */
+/* $Id: fsock.c,v 1.71 2001/07/25 21:06:01 sas Exp $ */
/* Synced with php 3.0 revision 1.121 1999-06-18 [ssb] */
/* Synced with php 3.0 revision 1.133 1999-07-21 [sas] */
@@ -89,8 +89,10 @@
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 @@
*/
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;