X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=reentr.pl;h=6b1f21c147f0f4ceb08c6c722d77e82a6ff3fcec;hb=24b5d5ccc3bc7535f387e48d7e29656751ae98a5;hp=ae56377c151d3a1d8923038af78f0fd6979cb443;hpb=b430fd0465bf67481688d8bedfceb885abf2a170;p=p5sagit%2Fp5-mst-13.2.git diff --git a/reentr.pl b/reentr.pl index ae56377..6b1f21c 100644 --- a/reentr.pl +++ b/reentr.pl @@ -161,7 +161,14 @@ while () { if ($opts{U} && open(U, ">d_${f}_r.U")) { select U; } - my $prereqh = $h eq 'stdio' ? '' : "i_$h"; # There's no i_stdio. + my $prereqs = ''; + my $prereqh = ''; + my $prereqsh = ''; + if ($h ne 'stdio') { # There's no i_stdio. + $prereqs = "i_$h"; + $prereqh = "$h.h"; + $prereqsh = "\$$prereqs $prereqh"; + } print <) { ?RCS: ?RCS: Generated by the reentr.pl from the Perl 5.8 distribution. ?RCS: -?MAKE:d_${f}_r ${f}_r_proto: Inlibc Protochk Hasproto i_systypes $prereqh usethreads +?MAKE:d_${f}_r ${f}_r_proto: Inlibc Protochk Hasproto i_systypes i_systime $prereqs usethreads i_pthread ?MAKE: -pick add \$@ %< ?S:d_${f}_r: ?S: This variable conditionally defines the HAS_${F}_R symbol, @@ -200,7 +207,12 @@ set ${f}_r d_${f}_r eval \$inlibc case "\$d_${f}_r" in "\$define") - hdrs="\$i_systypes sys/types.h define stdio.h \$i_${h} $h.h" + hdrs="\$i_systypes sys/types.h define stdio.h $prereqsh" + case "$h" in + time) + hdrs="\$hdrs \$i_systime sys/time.h" + ;; + esac case "\$d_${f}_r_proto:\$usethreads" in ":define") d_${f}_r_proto=define set d_${f}_r_proto ${f}_r \$hdrs @@ -231,7 +243,7 @@ EOF if ($opts{U}) { print <&4 ;; * ) case "\$${f}_r_proto" in @@ -244,6 +256,8 @@ EOF *) case "\$usethreads" in define) echo "${f}_r has no prototype, not using it." >&4 ;; esac + d_${f}_r=undef + ${f}_r_proto=0 ;; esac ;; @@ -305,11 +319,16 @@ sub define { /* The @F using \L$n? */ EOF + my $G; for my $f (@F) { my $F = uc $f; my $h = "${F}_R_HAS_$n"; push @H, $h; my @h = grep { /$p/ } @{$seena{$f}}; + unless (defined $G) { + $G = $F; + $G =~ s/^GET//; + } if (@h) { push @define, "#if defined(HAS_${F}_R) && (" . join(" || ", map { "${F}_R_PROTO == REENTRANT_PROTO_$_" } @h) . ")\n"; @@ -328,9 +347,9 @@ EOF EOF push @define, "#if (" . join(" || ", map { "defined($_)" } @H) . ")\n"; push @define, <_${f}_size = 256; /* Make something up. */ + PL_reentrant_buffer->_${f}_size = REENTRANTSMALLSIZE; EOF pushinitfree $f; pushssif $endif; @@ -427,6 +446,7 @@ EOF pushssif $ifdef; my $g = $f; $g =~ s/nam/ent/g; + $g =~ s/^get//; my $G = uc $g; push @struct, <_${g}_size = sysconf($sc); + if (PL_reentrant_buffer->$sz == -1) + PL_reentrant_buffer->$sz = REENTRANTUSUALSIZE; # else # if defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ) PL_reentrant_buffer->_${g}_size = SIABUFSIZ; @@ -465,7 +489,7 @@ EOF # ifdef __sgi PL_reentrant_buffer->_${g}_size = BUFSIZ; # else - PL_reentrant_buffer->_${g}_size = 256; + PL_reentrant_buffer->_${g}_size = REENTRANTUSUALSIZE; # endif # endif # endif @@ -478,9 +502,11 @@ EOF pushssif $ifdef; my $g = $f; $g =~ s/byname/ent/; + $g =~ s/^get//; my $G = uc $g; my $D = ifprotomatch($F, grep {/D/} @p); my $d = $seend{$f}; + $d =~ s/\*$//; # snip: we need need the base type. push @struct, <_${g}_size = 2048; /* Any better ideas? */ + PL_reentrant_buffer->_${g}_size = REENTRANTUSUALSIZE; #endif EOF push @init, <op_type) { -#ifdef USE_GETHOSTENT_BUFFER +#ifdef USE_HOSTENT_BUFFER case OP_GHBYADDR: case OP_GHBYNAME: case OP_GHOSTENT: { - if (PL_reentrant_buffer->_gethostent_size <= REENTRANTHALFMAXSIZE) { - PL_reentrant_buffer->_gethostent_size *= 2; - Renew(PL_reentrant_buffer->_gethostent_buffer, - PL_reentrant_buffer->_gethostent_size, char); + if (PL_reentrant_buffer->_hostent_size <= REENTRANTHALFMAXSIZE) { + PL_reentrant_buffer->_hostent_size *= 2; + Renew(PL_reentrant_buffer->_hostent_buffer, + PL_reentrant_buffer->_hostent_size, char); switch (PL_op->op_type) { case OP_GHBYADDR: p0 = va_arg(ap, void *); @@ -741,16 +777,16 @@ Perl_reentrant_retry(const char *f, ...) } break; #endif -#ifdef USE_GETGRENT_BUFFER +#ifdef USE_GRENT_BUFFER case OP_GGRNAM: case OP_GGRGID: case OP_GGRENT: { - if (PL_reentrant_buffer->_getgrent_size <= REENTRANTHALFMAXSIZE) { + if (PL_reentrant_buffer->_grent_size <= REENTRANTHALFMAXSIZE) { Gid_t gid; - PL_reentrant_buffer->_getgrent_size *= 2; - Renew(PL_reentrant_buffer->_getgrent_buffer, - PL_reentrant_buffer->_getgrent_size, char); + PL_reentrant_buffer->_grent_size *= 2; + Renew(PL_reentrant_buffer->_grent_buffer, + PL_reentrant_buffer->_grent_size, char); switch (PL_op->op_type) { case OP_GGRNAM: p0 = va_arg(ap, void *); @@ -767,16 +803,16 @@ Perl_reentrant_retry(const char *f, ...) } break; #endif -#ifdef USE_GETNETENT_BUFFER +#ifdef USE_NETENT_BUFFER case OP_GNBYADDR: case OP_GNBYNAME: case OP_GNETENT: { - if (PL_reentrant_buffer->_getnetent_size <= REENTRANTHALFMAXSIZE) { + if (PL_reentrant_buffer->_netent_size <= REENTRANTHALFMAXSIZE) { Netdb_net_t net; - PL_reentrant_buffer->_getnetent_size *= 2; - Renew(PL_reentrant_buffer->_getnetent_buffer, - PL_reentrant_buffer->_getnetent_size, char); + PL_reentrant_buffer->_netent_size *= 2; + Renew(PL_reentrant_buffer->_netent_buffer, + PL_reentrant_buffer->_netent_size, char); switch (PL_op->op_type) { case OP_GNBYADDR: net = va_arg(ap, Netdb_net_t); @@ -794,16 +830,16 @@ Perl_reentrant_retry(const char *f, ...) } break; #endif -#ifdef USE_GETPWENT_BUFFER +#ifdef USE_PWENT_BUFFER case OP_GPWNAM: case OP_GPWUID: case OP_GPWENT: { - if (PL_reentrant_buffer->_getpwent_size <= REENTRANTHALFMAXSIZE) { + if (PL_reentrant_buffer->_pwent_size <= REENTRANTHALFMAXSIZE) { Uid_t uid; - PL_reentrant_buffer->_getpwent_size *= 2; - Renew(PL_reentrant_buffer->_getpwent_buffer, - PL_reentrant_buffer->_getpwent_size, char); + PL_reentrant_buffer->_pwent_size *= 2; + Renew(PL_reentrant_buffer->_pwent_buffer, + PL_reentrant_buffer->_pwent_size, char); switch (PL_op->op_type) { case OP_GPWNAM: p0 = va_arg(ap, void *); @@ -820,15 +856,15 @@ Perl_reentrant_retry(const char *f, ...) } break; #endif -#ifdef USE_GETPROTOENT_BUFFER +#ifdef USE_PROTOENT_BUFFER case OP_GPBYNAME: case OP_GPBYNUMBER: case OP_GPROTOENT: { - if (PL_reentrant_buffer->_getprotoent_size <= REENTRANTHALFMAXSIZE) { - PL_reentrant_buffer->_getprotoent_size *= 2; - Renew(PL_reentrant_buffer->_getprotoent_buffer, - PL_reentrant_buffer->_getprotoent_size, char); + if (PL_reentrant_buffer->_protoent_size <= REENTRANTHALFMAXSIZE) { + PL_reentrant_buffer->_protoent_size *= 2; + Renew(PL_reentrant_buffer->_protoent_buffer, + PL_reentrant_buffer->_protoent_size, char); switch (PL_op->op_type) { case OP_GPBYNAME: p0 = va_arg(ap, void *); @@ -845,15 +881,15 @@ Perl_reentrant_retry(const char *f, ...) } break; #endif -#ifdef USE_GETSERVENT_BUFFER +#ifdef USE_SERVENT_BUFFER case OP_GSBYNAME: case OP_GSBYPORT: case OP_GSERVENT: { - if (PL_reentrant_buffer->_getservent_size <= REENTRANTHALFMAXSIZE) { - PL_reentrant_buffer->_getservent_size *= 2; - Renew(PL_reentrant_buffer->_getservent_buffer, - PL_reentrant_buffer->_getservent_size, char); + if (PL_reentrant_buffer->_servent_size <= REENTRANTHALFMAXSIZE) { + PL_reentrant_buffer->_servent_size *= 2; + Renew(PL_reentrant_buffer->_servent_buffer, + PL_reentrant_buffer->_servent_size, char); switch (PL_op->op_type) { case OP_GSBYNAME: p0 = va_arg(ap, void *); @@ -891,11 +927,11 @@ ctermid B |stdio | |B_B ctime S |time |const time_t |B_SB|B_SBI|I_SB|I_SBI drand48 |stdlib |struct drand48_data |I_ST|T=double* endgrent |grp | |I_H|V_H -endhostent |netdb |struct hostent_data |I_S|V_S -endnetent |netdb |struct netent_data |I_S|V_S -endprotoent |netdb |struct protoent_data |I_S|V_S +endhostent |netdb | |I_D|V_D|D=struct hostent_data* +endnetent |netdb | |I_D|V_D|D=struct netent_data* +endprotoent |netdb | |I_D|V_D|D=struct protoent_data* endpwent |pwd | |I_H|V_H -endservent |netdb |struct servent_data |I_S|V_S +endservent |netdb | |I_D|V_D|D=struct servent_data* getgrent |grp |struct group |I_SBWR|I_SBIR|S_SBW|S_SBI|I_SBI|I_SBIH getgrgid T |grp |struct group |I_TSBWR|I_TSBIR|I_TSBI|S_TSBI|T=gid_t getgrnam C |grp |struct group |I_CSBWR|I_CSBIR|S_CBI|I_CSBI|S_CSBI