Comment that this "optimisation" is actually a necessary fixup.

[perl5.git] / reentr.c

diff --git a/reentr.c b/reentr.c
index 35a1e91..881bd87 100644 (file)
--- a/reentr.c
+++ b/reentr.c
@@ -1,7 +1,7 @@
 /*
  *    reentr.c
  *
- *    Copyright (c) 1997-2002, Larry Wall
+ *    Copyright (C) 2002, 2003, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -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;
@@ -146,10 +146,8 @@ Perl_reentrant_init(pTHX) {
        New(31338, PL_reentrant_buffer->_asctime_buffer, PL_reentrant_buffer->_asctime_size, char);
 #endif /* HAS_ASCTIME_R */
 #ifdef HAS_CRYPT_R
-#ifdef __GLIBC__
-       PL_reentrant_buffer->_crypt_struct.initialized = 0;
-       /* work around glibc-2.2.5 bug */
-       PL_reentrant_buffer->_crypt_struct.current_saltbits = 0;
+#if CRYPT_R_PROTO != REENTRANT_PROTO_B_CCD
+       PL_reentrant_buffer->_crypt_struct_buffer = 0;
 #endif
 #endif /* HAS_CRYPT_R */
 #ifdef HAS_CTIME_R
@@ -230,6 +228,9 @@ Perl_reentrant_free(pTHX) {
        Safefree(PL_reentrant_buffer->_asctime_buffer);
 #endif /* HAS_ASCTIME_R */
 #ifdef HAS_CRYPT_R
+#if CRYPT_R_PROTO != REENTRANT_PROTO_B_CCD
+       Safefree(PL_reentrant_buffer->_crypt_struct_buffer);
+#endif
 #endif /* HAS_CRYPT_R */
 #ifdef HAS_CTIME_R
        Safefree(PL_reentrant_buffer->_ctime_buffer);
@@ -300,7 +301,7 @@ Perl_reentrant_retry(const char *f, ...)
     dTHX;
     void *retptr = NULL;
 #ifdef USE_REENTRANT_API
-#  if defined(USE_HOSTENT_BUFFER) || defined(USE_GRENT_BUFFER) || defined(USE_NETENT_BUFFER) || defined(USE_PWENT_BUFFER) || defined(USE_PROTOENT_BUFFER) || defined(USE_SRVENT_BUFFER)
+#  if defined(USE_HOSTENT_BUFFER) || defined(USE_GRENT_BUFFER) || defined(USE_NETENT_BUFFER) || defined(USE_PWENT_BUFFER) || defined(USE_PROTOENT_BUFFER) || defined(USE_SERVENT_BUFFER)
     void *p0;
 #  endif
 #  if defined(USE_SERVENT_BUFFER)
@@ -342,10 +343,10 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GHOSTENT:
                    retptr = gethostent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
-           SETERRNO(ERANGE, LIB_INVARG);
        }
        break;
 #endif
@@ -368,15 +369,19 @@ Perl_reentrant_retry(const char *f, ...)
                    p0 = va_arg(ap, void *);
                    retptr = getgrnam(p0); break;
                case OP_GGRGID:
+#if Gid_t_size < INTSIZE
+                   gid = (Gid_t)va_arg(ap, int);
+#else
                    gid = va_arg(ap, Gid_t);
+#endif
                    retptr = getgrgid(gid); break;
                case OP_GGRENT:
                    retptr = getgrent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
-           SETERRNO(ERANGE, LIB_INVARG);
        }
        break;
 #endif
@@ -405,10 +410,10 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GNETENT:
                    retptr = getnetent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
-           SETERRNO(ERANGE, LIB_INVARG);
        }
        break;
 #endif
@@ -431,11 +436,16 @@ Perl_reentrant_retry(const char *f, ...)
                    p0 = va_arg(ap, void *);
                    retptr = getpwnam(p0); break;
                case OP_GPWUID:
+#if Uid_t_size < INTSIZE
+                   uid = (Uid_t)va_arg(ap, int);
+#else
                    uid = va_arg(ap, Uid_t);
+#endif
                    retptr = getpwuid(uid); break;
                case OP_GPWENT:
                    retptr = getpwent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
@@ -465,10 +475,10 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GPROTOENT:
                    retptr = getprotoent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
-           SETERRNO(ERANGE, LIB_INVARG);
        }
        break;
 #endif
@@ -497,10 +507,10 @@ Perl_reentrant_retry(const char *f, ...)
                case OP_GSERVENT:
                    retptr = getservent(); break;
                default:
+                   SETERRNO(ERANGE, LIB_INVARG);
                    break;
                }
            }
-           SETERRNO(ERANGE, LIB_INVARG);
        }
        break;
 #endif