Integrate:

[perl5.git] / reentr.pl

diff --git a/reentr.pl b/reentr.pl
index 19b9852..6b23aa8 100644 (file)
--- a/reentr.pl
+++ b/reentr.pl
@@ -204,6 +204,9 @@ while (<DATA>) { # Read in the protypes.
 ?S:.
 ?S:${func}_r_proto:
 ?S:    This variable encodes the prototype of ${func}_r.
+?S:    It is zero if d_${func}_r is undef, and one of the
+?S:    REENTRANT_PROTO_T_ABC macros of reentr.h if d_${func}_r
+?S:    is defined.
 ?S:.
 ?C:HAS_${FUNC}_R:
 ?C:    This symbol, if defined, indicates that the ${func}_r routine
@@ -211,6 +214,9 @@ while (<DATA>) { # Read in the protypes.
 ?C:.
 ?C:${FUNC}_R_PROTO:
 ?C:    This symbol encodes the prototype of ${func}_r.
+?C:    It is zero if d_${func}_r is undef, and one of the
+?C:    REENTRANT_PROTO_T_ABC macros of reentr.h if d_${func}_r
+?C:    is defined.
 ?C:.
 ?H:#\$d_${func}_r HAS_${FUNC}_R           /**/
 ?H:#define ${FUNC}_R_PROTO \$${func}_r_proto      /**/
@@ -451,6 +457,8 @@ EOF
            push @init, <<EOF;
 #ifdef __GLIBC__
        PL_reentrant_buffer->_${func}_struct.initialized = 0;
+       /* work around glibc-2.2.5 bug */
+       PL_reentrant_buffer->_${func}_struct.current_saltbits = 0;
 #endif
 EOF
            pushssif $endif;
@@ -485,43 +493,36 @@ EOF
        $seent{$func}*  _${genfunc}_ptr;
 #   endif
 EOF
-           if ($genfunc eq 'getspent') {
-               push @size, <<EOF;
-       PL_reentrant_buffer->_${genfunc}_size = 1024;
-EOF
-           } else {
-               push @struct, <<EOF;
+           push @struct, <<EOF;
 #   ifdef USE_${GENFUNC}_FPTR
        FILE*   _${genfunc}_fptr;
 #   endif
 EOF
-                   push @init, <<EOF;
+           push @init, <<EOF;
 #   ifdef USE_${GENFUNC}_FPTR
        PL_reentrant_buffer->_${genfunc}_fptr = NULL;
 #   endif
 EOF
-               my $sc = $genfunc eq 'getgrent' ?
+           my $sc = $genfunc eq 'grent' ?
                    '_SC_GETGR_R_SIZE_MAX' : '_SC_GETPW_R_SIZE_MAX';
-               my $sz = $genfunc eq 'getgrent' ?
-                    '_grent_size' : '_pwent_size';
-               push @size, <<EOF;
+           my $sz = "_${genfunc}_size";
+           push @size, <<EOF;
 #   if defined(HAS_SYSCONF) && defined($sc) && !defined(__GLIBC__)
-       PL_reentrant_buffer->_${genfunc}_size = sysconf($sc);
+       PL_reentrant_buffer->$sz = sysconf($sc);
        if (PL_reentrant_buffer->$sz == -1)
                PL_reentrant_buffer->$sz = REENTRANTUSUALSIZE;
 #   else
 #       if defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
-       PL_reentrant_buffer->_${genfunc}_size = SIABUFSIZ;
+       PL_reentrant_buffer->$sz = SIABUFSIZ;
 #       else
 #           ifdef __sgi
-       PL_reentrant_buffer->_${genfunc}_size = BUFSIZ;
+       PL_reentrant_buffer->$sz = BUFSIZ;
 #           else
-       PL_reentrant_buffer->_${genfunc}_size = REENTRANTUSUALSIZE;
+       PL_reentrant_buffer->$sz = REENTRANTUSUALSIZE;
 #           endif
 #       endif
 #   endif 
 EOF
-            }
            pushinitfree $genfunc;
            pushssif $endif;
        }
@@ -780,15 +781,17 @@ Perl_reentrant_retry(const char *f, ...)
 
     va_start(ap, f);
 
-#define REENTRANTHALFMAXSIZE 32768 /* The maximum may end up twice this. */
-
     switch (PL_op->op_type) {
 #ifdef USE_HOSTENT_BUFFER
     case OP_GHBYADDR:
     case OP_GHBYNAME:
     case OP_GHOSTENT:
        {
-           if (PL_reentrant_buffer->_hostent_size <= REENTRANTHALFMAXSIZE) {
+#ifdef PERL_REENTRANT_MAXSIZE
+           if (PL_reentrant_buffer->_hostent_size <=
+               PERL_REENTRANT_MAXSIZE / 2)
+#endif
+           {
                PL_reentrant_buffer->_hostent_size *= 2;
                Renew(PL_reentrant_buffer->_hostent_buffer,
                      PL_reentrant_buffer->_hostent_size, char);
@@ -804,6 +807,7 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GHOSTENT:
                    retptr = gethostent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
@@ -815,7 +819,11 @@ Perl_reentrant_retry(const char *f, ...)
     case OP_GGRGID:
     case OP_GGRENT:
        {
-           if (PL_reentrant_buffer->_grent_size <= REENTRANTHALFMAXSIZE) {
+#ifdef PERL_REENTRANT_MAXSIZE
+           if (PL_reentrant_buffer->_grent_size <=
+               PERL_REENTRANT_MAXSIZE / 2)
+#endif
+           {
                Gid_t gid;
                PL_reentrant_buffer->_grent_size *= 2;
                Renew(PL_reentrant_buffer->_grent_buffer,
@@ -830,6 +838,7 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GGRENT:
                    retptr = getgrent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
@@ -841,7 +850,11 @@ Perl_reentrant_retry(const char *f, ...)
     case OP_GNBYNAME:
     case OP_GNETENT:
        {
-           if (PL_reentrant_buffer->_netent_size <= REENTRANTHALFMAXSIZE) {
+#ifdef PERL_REENTRANT_MAXSIZE
+           if (PL_reentrant_buffer->_netent_size <=
+               PERL_REENTRANT_MAXSIZE / 2)
+#endif
+           {
                Netdb_net_t net;
                PL_reentrant_buffer->_netent_size *= 2;
                Renew(PL_reentrant_buffer->_netent_buffer,
@@ -857,6 +870,7 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GNETENT:
                    retptr = getnetent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
@@ -868,7 +882,11 @@ Perl_reentrant_retry(const char *f, ...)
     case OP_GPWUID:
     case OP_GPWENT:
        {
-           if (PL_reentrant_buffer->_pwent_size <= REENTRANTHALFMAXSIZE) {
+#ifdef PERL_REENTRANT_MAXSIZE
+           if (PL_reentrant_buffer->_pwent_size <=
+               PERL_REENTRANT_MAXSIZE / 2)
+#endif
+           {
                Uid_t uid;
                PL_reentrant_buffer->_pwent_size *= 2;
                Renew(PL_reentrant_buffer->_pwent_buffer,
@@ -883,6 +901,7 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GPWENT:
                    retptr = getpwent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
@@ -894,7 +913,11 @@ Perl_reentrant_retry(const char *f, ...)
     case OP_GPBYNUMBER:
     case OP_GPROTOENT:
        {
-           if (PL_reentrant_buffer->_protoent_size <= REENTRANTHALFMAXSIZE) {
+#ifdef PERL_REENTRANT_MAXSIZE
+           if (PL_reentrant_buffer->_protoent_size <=
+               PERL_REENTRANT_MAXSIZE / 2)
+#endif
+           {
                PL_reentrant_buffer->_protoent_size *= 2;
                Renew(PL_reentrant_buffer->_protoent_buffer,
                      PL_reentrant_buffer->_protoent_size, char);
@@ -908,6 +931,7 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GPROTOENT:
                    retptr = getprotoent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
@@ -919,7 +943,11 @@ Perl_reentrant_retry(const char *f, ...)
     case OP_GSBYPORT:
     case OP_GSERVENT:
        {
-           if (PL_reentrant_buffer->_servent_size <= REENTRANTHALFMAXSIZE) {
+#ifdef PERL_REENTRANT_MAXSIZE
+           if (PL_reentrant_buffer->_servent_size <=
+               PERL_REENTRANT_MAXSIZE / 2)
+#endif
+           {
                PL_reentrant_buffer->_servent_size *= 2;
                Renew(PL_reentrant_buffer->_servent_buffer,
                      PL_reentrant_buffer->_servent_size, char);
@@ -935,6 +963,7 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GSERVENT:
                    retptr = getservent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }