Re: [PHP4BETA] cvs: /php4/ext/standard post.c

Was I wrong in my earlier post when I assumed not all platforms have _r alternatives? Zeev On Fri, 26 Nov 1999, Sascha Schumann wrote: > sas Fri Nov 26 08:35:01 1999 EDT > > Modified files: > /php4/ext/standard post.c > Log: > Replace strtok with strtok_r > > > Index: php4/ext/standard/post.c > diff -u php4/ext/standard/post.c:1.25 php4/ext/standard/post.c:1.26 > --- php4/ext/standard/post.c:1.25 Wed Oct 6 01:26:25 1999 > +++ php4/ext/standard/post.c Fri Nov 26 08:34:31 1999 > @@ -305,6 +305,7 @@ > char *res = NULL, *var, *val; > pval *array_ptr; > int free_buffer=0; > + char *strtok_buf = NULL; > > switch (arg) { > case PARSE_POST: > @@ -375,11 +376,11 @@ > } else { > #endif > if (arg == PARSE_COOKIE) { > - var = strtok(res, ";"); > + var = strtok_r(res, ";", &strtok_buf); > } else if (arg == PARSE_POST) { > - var = strtok(res, "&"); > + var = strtok_r(res, "&", &strtok_buf); > } else { > - var = strtok(res, PG(arg_separator)); > + var = strtok_r(res, PG(arg_separator), &strtok_buf); > } > > while (var) { > @@ -392,11 +393,11 @@ > php_parse_gpc_data2(val,var,array_ptr ELS_CC PLS_CC); > } > if (arg == PARSE_COOKIE) { > - var = strtok(NULL, ";"); > + var = strtok_r(NULL, ";", &strtok_buf); > } else if (arg == PARSE_POST) { > - var = strtok(NULL, "&"); > + var = strtok_r(NULL, "&", &strtok_buf); > } else { > - var = strtok(NULL, PG(arg_separator)); > + var = strtok_r(NULL, PG(arg_separator), &strtok_buf); > } > } > #if HAVE_FDFLIB > > > > -- > PHP 4.0 Beta Mailing List <http://www.php.net/version4/> > To unsubscribe, e-mail: php4beta-unsubscribe@lists.php.net > For additional commands, e-mail: php4beta-help@lists.php.net > To contact the list administrators, e-mail: php4beta-admin@lists.php.net > -- ----------------------------------------------------- Zeev Suraski <zeev@zend.com> http://www.zend.com/