* cygtls.cc (free_local): New macro.

(_cygtls::remove): Use free_local to free known-malloced local variables.
* cygtls.h: Mark some variables as "malloced".
* net.cc (enum struct_type): Rename from is_* to t_* for clarity.
(dump_protoent): Delete.
(dup_ent): New macro.
(__dup_ent): Renamed from dup_ent.  Change arguments for convenience.  Replace
first argument with newly alloced value.  Allocate a rounded number of bytes in
an attempt to try to reuse space.  Subsume "dump_protent".
(cygwin_getprotobyname): Simplify using new dup_ent functionality.
(cygwin_getprotobynumber): Ditto.
(cygwin_getservbyname): Ditto.
(cygwin_getservbyport): Ditto.
(cygwin_gethostname): Ditto.
(cygwin_gethostbyname): Ditto.
* tlsoffsets.h: Regenerate.
* syslog.cc (openlog): Use NULL rather than 0, for consistency with the rest of
cygwin.
(pass_handler::initialize): Use unbuffered I/O in pass one.

winsup/cygwin/ChangeLog

@@ -1,3 +1,28 @@
+2005-03-16  Christopher Faylor  <cgf@timesys.com>
+
+	* cygtls.cc (free_local): New macro.
+	(_cygtls::remove): Use free_local to free known-malloced local
+	variables.
+	* cygtls.h: Mark some variables as "malloced".
+	* net.cc (enum struct_type): Rename from is_* to t_* for clarity.
+	(dump_protoent): Delete.
+	(dup_ent): New macro.
+	(__dup_ent): Renamed from dup_ent.  Change arguments for convenience.
+	Replace first argument with newly alloced value.  Allocate a rounded
+	number of bytes in an attempt to try to reuse space.  Subsume
+	"dump_protent".
+	(cygwin_getprotobyname): Simplify using new dup_ent functionality.
+	(cygwin_getprotobynumber): Ditto.
+	(cygwin_getservbyname): Ditto.
+	(cygwin_getservbyport): Ditto.
+	(cygwin_gethostname): Ditto.
+	(cygwin_gethostbyname): Ditto.
+	* tlsoffsets.h: Regenerate.
+
+	* syslog.cc (openlog): Use NULL rather than 0, for consistency with the
+	rest of cygwin.
+	(pass_handler::initialize): Use unbuffered I/O in pass one.
+
 2005-03-15  Christopher Faylor  <cgf@timesys.com>
 
 	* errno.cc (errmap): Correct typo in previous change.

winsup/cygwin/cygtls.cc

@@ -149,6 +149,13 @@ _cygtls::fixup_after_fork ()
   wq.thread_ev = NULL;
 }
 
+#define free_local(x) \
+  if (locals.x) \
+    { \
+      free (locals.x); \
+      locals.x = NULL; \
+    }
+
 void
 _cygtls::remove (DWORD wait)
 {
@@ -159,8 +166,12 @@ _cygtls::remove (DWORD wait)
   // select to control this themselves
   if (locals.exitsock != INVALID_SOCKET)
     closesocket (locals.exitsock);
-  if (locals.process_ident != NULL)
+  free_local (process_ident);
-    free (locals.process_ident);
+  free_local (ntoa_buf);
+  free_local (protoent_buf);
+  free_local (servent_buf);
+  free_local (hostent_buf);
+
   do
     {
       sentry here (wait);

winsup/cygwin/cygtls.h

@@ -73,7 +73,7 @@ struct _local_storage
   char strerror_buf[20];
 
   /* sysloc.cc */
-  char *process_ident;
+  char *process_ident;			// note: malloced
   int process_logopt;
   int process_facility;
   int process_logmask;
@@ -86,10 +86,10 @@ struct _local_storage
   char username[UNLEN + 1];
 
   /* net.cc */
-  char *ntoa_buf;
+  char *ntoa_buf;			// note: malloced
-  struct protoent *protoent_buf;
+  struct protoent *protoent_buf;	// note: malloced
-  struct servent *servent_buf;
+  struct servent *servent_buf;		// note: malloced
-  struct hostent *hostent_buf;
+  struct hostent *hostent_buf;		// note: malloced
   char signamebuf[sizeof ("Unknown signal 4294967295   ")];
 };
 

winsup/cygwin/net.cc

@@ -114,13 +114,6 @@ ntohs (unsigned short x)
   return htons (x);
 }
 
-static void
-dump_protoent (struct protoent *p)
-{
-  if (p)
-    debug_printf ("protoent %s %x %x", p->p_name, p->p_aliases, p->p_proto);
-}
-
 /* exported as inet_ntoa: BSD 4.3 */
 extern "C" char *
 cygwin_inet_ntoa (struct in_addr in)
@@ -365,7 +358,7 @@ struct unionent
 
 enum struct_type
 {
-  is_hostent, is_protoent, is_servent
+  t_hostent, t_protoent, t_servent
 };
 
 static const char *entnames[] = {"host", "proto", "serv"};
@@ -379,37 +372,37 @@ static const char *entnames[] = {"host", "proto", "serv"};
    The 'unionent' struct is a union of all of the currently used
    *ent structure.  */
 
+#define dup_ent(old, src, type) __dup_ent ((unionent *&) (_my_tls.locals.old), (unionent *) (src), type)
 #ifdef DEBUGGING
 static void *
 #else
 static inline void *
 #endif
-dup_ent (void *old, void *src0, struct_type type)
+__dup_ent (unionent *&dst, unionent *src, struct_type type)
 {
-  if (old)
+  if (dst)
+    debug_printf ("old %sent structure \"%s\" %p\n", entnames[type],
+		  ((unionent *) dst)->name, dst);
+
+  if (!src)
     {
-      debug_printf ("freeing old %sent structure \"%s\" %p\n", entnames[type],
+      set_winsock_errno ();
-		    ((unionent *) old)->name, old);
+      return NULL;
-      free (old);
     }
 
-  if (!src0)
-    return NULL;
-
-  unionent *src = (unionent *) src0;
   debug_printf ("duping %sent \"%s\", %p", entnames[type], src->name, src);
 
   /* Find the size of the raw structure minus any character strings, etc. */
   int sz, struct_sz;
   switch (type)
     {
-    case is_protoent:
+    case t_protoent:
       struct_sz = sizeof (protoent);
       break;
-    case is_servent:
+    case t_servent:
       struct_sz = sizeof (servent);
       break;
-    case is_hostent:
+    case t_hostent:
       struct_sz = sizeof (hostent);
       break;
     default:
@@ -443,7 +436,7 @@ dup_ent (void *old, void *src0, struct_type type)
   int protolen = 0;
   int addr_list_len = 0;
   char *s_proto = NULL;
-  if (type == is_servent)
+  if (type == t_servent)
     {
       if (src->s_proto)
 	{
@@ -456,7 +449,7 @@ dup_ent (void *old, void *src0, struct_type type)
 	  sz += (protolen = strlen_round (s_proto));
 	}
     }
-  else if (type == is_hostent)
+  else if (type == t_hostent)
     {
       /* Calculate the length and storage used for h_addr_list */
       for (av = src->h_addr_list; av && *av; av++)
@@ -471,12 +464,16 @@ dup_ent (void *old, void *src0, struct_type type)
 	}
     }
 
-  /* Allocate the storage needed */
+  /* Allocate the storage needed.  Allocate a rounded size to attempt to force
-  unionent *dst = (unionent *) calloc (1, sz);
+     reuse of this buffer so that a poorly-written caller will not be using
+     a freed buffer. */
+  unsigned rsz = 256 * ((sz + 255) / 256);
+  dst = (unionent *) realloc (dst, rsz);
 
   /* Hopefully, this worked. */
   if (dst)
     {
+      memset (dst, 0, sz);
       /* This field is common to all *ent structures but named differently
 	 in each, of course.  */
       dst->port_proto_addrtype = src->port_proto_addrtype;
@@ -504,8 +501,10 @@ dup_ent (void *old, void *src0, struct_type type)
 	    }
 	}
 
-      /* Do servent/hostent specific processing. */
+      /* Do servent/protoent/hostent specific processing. */
-      if (type == is_servent)
+      if (type == t_protoent)
+	debug_printf ("protoent %s %x %x", dst->name, dst->list, dst->port_proto_addrtype);
+      else if (type == t_servent)
 	{
 	  if (s_proto)
 	    {
@@ -513,7 +512,7 @@ dup_ent (void *old, void *src0, struct_type type)
 	      dp += protolen;
 	    }
 	}
-      else if (type == is_hostent)
+      else if (type == t_hostent)
 	{
 	  /* Transfer h_len and duplicate contents of h_addr_list, using
 	     memory after 'list' allocation. */
@@ -539,28 +538,14 @@ cygwin_getprotobyname (const char *p)
 {
   if (check_null_str_errno (p))
     return NULL;
-  _my_tls.locals.protoent_buf =
+  __builtin_return (dup_ent (protoent_buf, getprotobyname (p), t_protoent));
-    (protoent *) dup_ent (_my_tls.locals.protoent_buf, getprotobyname (p),
-			  is_protoent);
-  if (!_my_tls.locals.protoent_buf)
-    set_winsock_errno ();
-
-  dump_protoent (_my_tls.locals.protoent_buf);
-  return _my_tls.locals.protoent_buf;
 }
 
 /* exported as getprotobynumber: standards? */
 extern "C" struct protoent *
 cygwin_getprotobynumber (int number)
 {
-  _my_tls.locals.protoent_buf =
+  __builtin_return (dup_ent (protoent_buf, getprotobynumber (number), t_protoent));
-    (protoent *) dup_ent (_my_tls.locals.protoent_buf,
-			  getprotobynumber (number), is_protoent);
-  if (!_my_tls.locals.protoent_buf)
-    set_winsock_errno ();
-
-  dump_protoent (_my_tls.locals.protoent_buf);
-  return _my_tls.locals.protoent_buf;
 }
 
 bool
@@ -904,12 +889,8 @@ cygwin_getservbyname (const char *name, const char *proto)
       || (proto != NULL && check_null_str_errno (proto)))
     return NULL;
 
-  _my_tls.locals.servent_buf = (servent *) dup_ent (_my_tls.locals.servent_buf, getservbyname (name, proto),
+  dup_ent (servent_buf, getservbyname (name, proto), t_servent);
-				     is_servent);
+  syscall_printf ("%p = getservbyname (%s, %s)", _my_tls.locals.servent_buf, name, proto);
-  if (!_my_tls.locals.servent_buf)
-    set_winsock_errno ();
-
-  syscall_printf ("%x = getservbyname (%s, %s)", _my_tls.locals.servent_buf, name, proto);
   return _my_tls.locals.servent_buf;
 }
 
@@ -921,12 +902,8 @@ cygwin_getservbyport (int port, const char *proto)
   if (proto != NULL && check_null_str_errno (proto))
     return NULL;
 
-  _my_tls.locals.servent_buf = (servent *) dup_ent (_my_tls.locals.servent_buf, getservbyport (port, proto),
+  dup_ent (servent_buf, getservbyport (port, proto), t_servent);
-				     is_servent);
+  syscall_printf ("%p = getservbyport (%d, %s)", _my_tls.locals.servent_buf, port, proto);
-  if (!_my_tls.locals.servent_buf)
-    set_winsock_errno ();
-
-  syscall_printf ("%x = getservbyport (%d, %s)", _my_tls.locals.servent_buf, port, proto);
   return _my_tls.locals.servent_buf;
 }
 
@@ -955,6 +932,10 @@ cygwin_gethostname (char *name, size_t len)
 extern "C" struct hostent *
 cygwin_gethostbyname (const char *name)
 {
+  sig_dispatch_pending ();
+  if (check_null_str_errno (name))
+    return NULL;
+
   unsigned char tmp_addr[4];
   struct hostent tmp, *h;
   char *tmp_aliases[1] = {0};
@@ -962,12 +943,10 @@ cygwin_gethostbyname (const char *name)
   unsigned int a, b, c, d;
   char dummy;
 
-  sig_dispatch_pending ();
+  if (sscanf (name, "%u.%u.%u.%u%c", &a, &b, &c, &d, &dummy) != 4
-  if (check_null_str_errno (name))
+      || a >= 256 || b >= 256 || c >= 256 || d >= 256)
-    return NULL;
+    h = gethostbyname (name);
-
+  else
-  if (sscanf (name, "%u.%u.%u.%u%c", &a, &b, &c, &d, &dummy) == 4
-      && a < 256 && b < 256 && c < 256 && d < 256)
     {
       /* In case you don't have DNS, at least x.x.x.x still works */
       memset (&tmp, 0, sizeof (tmp));
@@ -983,21 +962,14 @@ cygwin_gethostbyname (const char *name)
       tmp.h_addr_list = tmp_addr_list;
       h = &tmp;
     }
+
+  if (dup_ent (hostent_buf, h, t_hostent))
+    debug_printf ("h_name %s", _my_tls.locals.hostent_buf->h_name);
   else
-    h = gethostbyname (name);
-
-  _my_tls.locals.hostent_buf = (hostent *) dup_ent (_my_tls.locals.hostent_buf, h, is_hostent);
-
-  if (!_my_tls.locals.hostent_buf)
     {
-      debug_printf ("name %s", name);
+      debug_printf ("dup_ent failed for name %s", name);
-      set_winsock_errno ();
       set_host_errno ();
     }
-  else
-    {
-      debug_printf ("h_name %s", _my_tls.locals.hostent_buf->h_name);
-    }
   return _my_tls.locals.hostent_buf;
 }
 
@@ -1009,18 +981,10 @@ cygwin_gethostbyaddr (const char *addr, int len, int type)
   if (__check_invalid_read_ptr_errno (addr, len))
     return NULL;
 
-  _my_tls.locals.hostent_buf = (hostent *) dup_ent (_my_tls.locals.hostent_buf,
+  if (dup_ent (hostent_buf, gethostbyaddr (addr, len, type), t_hostent))
-				     gethostbyaddr (addr, len, type),
+    debug_printf ("h_name %s", _my_tls.locals.hostent_buf->h_name);
-				     is_hostent);
-  if (!_my_tls.locals.hostent_buf)
-    {
-      set_winsock_errno ();
-      set_host_errno ();
-    }
   else
-    {
+    set_host_errno ();
-      debug_printf ("h_name %s", _my_tls.locals.hostent_buf->h_name);
-    }
   return _my_tls.locals.hostent_buf;
 }
 

winsup/cygwin/syslog.cc

@@ -50,12 +50,12 @@ openlog (const char *ident, int logopt, int facility)
     if (_my_tls.locals.process_ident != NULL)
       {
 	free (_my_tls.locals.process_ident);
-	_my_tls.locals.process_ident = 0;
+	_my_tls.locals.process_ident = NULL;
       }
     if (ident)
       {
 	_my_tls.locals.process_ident = (char *) malloc (strlen (ident) + 1);
-	if (_my_tls.locals.process_ident == NULL)
+	if (!_my_tls.locals.process_ident)
 	  {
 	    debug_printf ("failed to allocate memory for _my_tls.locals.process_ident");
 	    return;
@@ -138,6 +138,7 @@ pass_handler::initialize (int pass_number)
       return total_len_ + 1;
 
     fp_ = fopen ("/dev/null", "wb");
+    setbuf (fp_, NULL);
     if (fp_ == NULL)
       {
 	debug_printf ("failed to open /dev/null");