fflush() before invalidating stdio's fileno.

[p5sagit/p5-mst-13.2.git] / reentr.c

diff --git a/reentr.c b/reentr.c
index 3d8cdf8..052af90 100644 (file)
--- a/reentr.c
+++ b/reentr.c
@@ -35,10 +35,10 @@ Perl_reentrant_size(pTHX) {
 #ifdef HAS_DRAND48_R
 #endif /* HAS_DRAND48_R */
 #ifdef HAS_GETGRNAM_R
-#   if defined(HAS_SYSCONF) && defined(_SC_GETPW_R_SIZE_MAX) && !defined(__GLIBC__)
-       PL_reentrant_buffer->_grent_size = sysconf(_SC_GETPW_R_SIZE_MAX);
-       if (PL_reentrant_buffer->_pwent_size == -1)
-               PL_reentrant_buffer->_pwent_size = REENTRANTUSUALSIZE;
+#   if defined(HAS_SYSCONF) && defined(_SC_GETGR_R_SIZE_MAX) && !defined(__GLIBC__)
+       PL_reentrant_buffer->_grent_size = sysconf(_SC_GETGR_R_SIZE_MAX);
+       if (PL_reentrant_buffer->_grent_size == -1)
+               PL_reentrant_buffer->_grent_size = REENTRANTUSUALSIZE;
 #   else
 #       if defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
        PL_reentrant_buffer->_grent_size = SIABUFSIZ;
@@ -94,8 +94,8 @@ Perl_reentrant_size(pTHX) {
 #ifdef HAS_GETSPNAM_R
 #   if defined(HAS_SYSCONF) && defined(_SC_GETPW_R_SIZE_MAX) && !defined(__GLIBC__)
        PL_reentrant_buffer->_spent_size = sysconf(_SC_GETPW_R_SIZE_MAX);
-       if (PL_reentrant_buffer->_pwent_size == -1)
-               PL_reentrant_buffer->_pwent_size = REENTRANTUSUALSIZE;
+       if (PL_reentrant_buffer->_spent_size == -1)
+               PL_reentrant_buffer->_spent_size = REENTRANTUSUALSIZE;
 #   else
 #       if defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
        PL_reentrant_buffer->_spent_size = SIABUFSIZ;
@@ -312,9 +312,6 @@ Perl_reentrant_retry(const char *f, ...)
 #  if defined(USE_HOSTENT_BUFFER) || defined(USE_NETENT_BUFFER) || defined(USE_PROTOENT_BUFFER) || defined(USE_SERVENT_BUFFER)
     int anint;
 #  endif
-#ifdef PERL_REENTRANT_MAXSIZE
-    static const char larger[] = "Result from %s larger than %d bytes";
-#endif
     va_list ap;
 
     va_start(ap, f);
@@ -345,6 +342,7 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GHOSTENT:
                    retptr = gethostent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
@@ -375,6 +373,7 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GGRENT:
                    retptr = getgrent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
@@ -406,14 +405,10 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GNETENT:
                    retptr = getnetent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
-#ifdef PERL_REENTRANT_MAXSIZE
-           else if (ckWARN(WARN_MISC))
-               Perl_warner(aTHX_ packWARN(WARN_MISC),
-                           larger, OP_NAME(PL_op), PERL_REENTRANT_MAXSIZE);
-#endif
        }
        break;
 #endif
@@ -441,14 +436,10 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GPWENT:
                    retptr = getpwent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
-#ifdef PERL_REENTRANT_MAXSIZE
-           else if (ckWARN(WARN_MISC))
-               Perl_warner(aTHX_ packWARN(WARN_MISC),
-                           larger, OP_NAME(PL_op), PERL_REENTRANT_MAXSIZE);
-#endif
        }
        break;
 #endif
@@ -475,14 +466,10 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GPROTOENT:
                    retptr = getprotoent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
-#ifdef PERL_REENTRANT_MAXSIZE
-           else if (ckWARN(WARN_MISC))
-               Perl_warner(aTHX_ packWARN(WARN_MISC),
-                           larger, OP_NAME(PL_op), PERL_REENTRANT_MAXSIZE);
-#endif
        }
        break;
 #endif
@@ -511,14 +498,10 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GSERVENT:
                    retptr = getservent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
-#ifdef PERL_REENTRANT_MAXSIZE
-           else if (ckWARN(WARN_MISC))
-               Perl_warner(aTHX_ packWARN(WARN_MISC),
-                           larger, OP_NAME(PL_op), PERL_REENTRANT_MAXSIZE);
-#endif
        }
        break;
 #endif