* Makefile.in: Add cygheap.o.

* child_info.h: Add specific exec class.
* cygheap.h: New file.  Contains declarations for cygwin heap.
* cygheap.cc: New file.  Implements cygwin heap functions.
* dcrt0.cc (quoted): Simplify due to new method for passing arguments between
cygwin programs.
(alloc_stack_hard_way): Attempt to handle overlapped stack.
(dll_crt0_1): Move child_info processing here.  Accomodate new method for
passing arguments between cygwin programs.  Initialize cygwin heap.  Establish
__argc and __argv variables.
(_dll_crt0): Move most of child_info processing to dll_crt0_1.
(cygwin_dll_init): Remove duplication.
* dtable.cc (dtable::extend): Allocate dtable using cygwin heap.
(dtable::build_fhandler): Ditto for fhandler type being constructed.
(dtable::dup_worker): Free new fhandler from cygwin heap on error.
(dtable::select_*): Don't assume that this == fdtab.
(dtable::linearize_fd_array): Delete.
(dtable::delinearize_fd_array): Delete.
(dtable::fixup_after_exec): New file.
(dtable::vfork_child_dup): Use cygwin heap.
(dtable::vfork_parent_restore): Ditto.
* dtable.h: Remove obsolete methods.  Add new method.
* environ.cc (posify): Eliminate already_posix parameter and logic.
(envsize): New function.
(_addenv): Use envsize.
(environ_init): Accept an argument pointing to an existing environment list.
If supplied, allocate space for this in the the program's heap.
* fhandler.cc (fhandler_base::operator =): Move here from fhandler.h.  Use
cygwin heap to allocate filenames.
(fhandler_base::set_name): Allocate/free names from cygwin heap.
(fhandler_base::linearize): Delete.
(fhandler_base::de_linearize): Delete.
(fhandler_base::operator delete): Free from cygwin heap.
(fhandler_base::~fhandler_base): Ditto.
* fhandler.h: Accomodate elimination of *linearize and other changes above.
* fhandler_console.cc (fhandler_console::fixup_after_exec): Rename from
de_linearize.
* heap.h: New file.
* fhandler_tty.cc (fhandler_tty_slave::fhandler_tty_slave): Use cygwin heap for
name.  fhandler_tty::fixup_after_exec): Rename from de_linearize.
* fork.cc (fork): Call cygheap_fixup_in_child.
* heap.cc: Use declarations in heap.h.
* malloc.cc: Sprinkle assertions throughout to catch attempts to free/realloc
something from the cygwin heap.
* path.cc: Throughout, eliminate use of per-thread cache for cwd.  Use cwd_*
functions rather than cwd_* variables to access cwd_win32 and cwd_posix.
(cwd_win32): New function.
(cwd_posix): New function.
(cwd_hash): New function.
(cwd_fixup_after_exec): New function.
* path.h: Accomodate path.cc changes.
* pinfo.cc (pinfo_init): Accept a pointer to an environment table.  Pass this
to environ_init.  Eliminate old 'title' tests.
* pinfo.h: Accomodate above change in argument.
* spawn.cc (struct av): New method for building argv list.
(av::unshift): New method.
(spawn_guts): Allocate everything that the child process needs in the cygwin
heap and pass a pointer to this to the child.  Build argv list using new
method.  Eliminate delinearize stuff.
* thread.h: Eliminate _cwd_win32 and _cwd_posix buffers.
* winsup.h: Eliminate obsolete functions.  Add envsize() declaration.

1 files changed, 67 insertions, 67 deletions

diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index bcd8f8f29..4f1a8a0be 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -354,18 +354,18 @@ cygwin_socket (int af, int type, int protocol)
       soc = socket (AF_INET, type, 0);
 
       if (soc == INVALID_SOCKET)
-        {
-          set_winsock_errno ();
-          goto done;
-        }
+	{
+	  set_winsock_errno ();
+	  goto done;
+	}
 
       soc = duplicate_socket (soc);
 
       const char *name;
       if (af == AF_INET)
-        name = (type == SOCK_STREAM ? "/dev/tcp" : "/dev/udp");
+	name = (type == SOCK_STREAM ? "/dev/tcp" : "/dev/udp");
       else
-        name = (type == SOCK_STREAM ? "/dev/streamsocket" : "/dev/dgsocket");
+	name = (type == SOCK_STREAM ? "/dev/streamsocket" : "/dev/dgsocket");
 
       fdsock (fd, name, soc);
       res = fd;
@@ -781,11 +781,11 @@ cygwin_bind (int fd, struct sockaddr *my_addr, int addrlen)
 	  int len = sizeof sin;
 	  int fd;
 
-          if (strlen (un_addr->sun_path) >= UNIX_PATH_LEN)
-            {
-              set_errno (ENAMETOOLONG);
-              goto out;
-            }
+	  if (strlen (un_addr->sun_path) >= UNIX_PATH_LEN)
+	    {
+	      set_errno (ENAMETOOLONG);
+	      goto out;
+	    }
 	  sin.sin_family = AF_INET;
 	  sin.sin_port = 0;
 	  sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
@@ -805,36 +805,36 @@ cygwin_bind (int fd, struct sockaddr *my_addr, int addrlen)
 	  sin.sin_port = ntohs (sin.sin_port);
 	  debug_printf ("AF_UNIX: socket bound to port %u", sin.sin_port);
 
-          /* bind must fail if file system socket object already exists
-             so _open() is called with O_EXCL flag. */
+	  /* bind must fail if file system socket object already exists
+	     so _open() is called with O_EXCL flag. */
 	  fd = _open (un_addr->sun_path,
-                      O_WRONLY | O_CREAT | O_EXCL | O_BINARY,
-                      0);
+		      O_WRONLY | O_CREAT | O_EXCL | O_BINARY,
+		      0);
 	  if (fd < 0)
-            {
-              if (get_errno () == EEXIST)
-                set_errno (EADDRINUSE);
+	    {
+	      if (get_errno () == EEXIST)
+		set_errno (EADDRINUSE);
 	      goto out;
-            }
+	    }
 
-          char buf[sizeof (SOCKET_COOKIE) + 10];
-          __small_sprintf (buf, "%s%u", SOCKET_COOKIE, sin.sin_port);
-          len = strlen (buf) + 1;
+	  char buf[sizeof (SOCKET_COOKIE) + 10];
+	  __small_sprintf (buf, "%s%u", SOCKET_COOKIE, sin.sin_port);
+	  len = strlen (buf) + 1;
 
-          /* Note that the terminating nul is written.  */
-          if (_write (fd, buf, len) != len)
-            {
+	  /* Note that the terminating nul is written.  */
+	  if (_write (fd, buf, len) != len)
+	    {
 	      save_errno here;
-              _close (fd);
-              _unlink (un_addr->sun_path);
-            }
-          else
-            {
-              _close (fd);
-              chmod (un_addr->sun_path,
-                (S_IFSOCK | S_IRWXU | S_IRWXG | S_IRWXO) & ~myself->umask);
+	      _close (fd);
+	      _unlink (un_addr->sun_path);
+	    }
+	  else
+	    {
+	      _close (fd);
+	      chmod (un_addr->sun_path,
+		(S_IFSOCK | S_IRWXU | S_IRWXG | S_IRWXO) & ~myself->umask);
 	      res = 0;
-            }
+	    }
 #undef un_addr
 	}
       else if (bind (sock->get_socket (), my_addr, addrlen))
@@ -1032,7 +1032,7 @@ getdomainname (char *domain, int len)
  * \Device\<Netcard>, where netcard is the name of the net device.
  * Then look under:
  * HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\<NetCard>\
- *                                                  Parameters\Tcpip
+ *							Parameters\Tcpip
  * at the IPAddress, Subnetmask and DefaultGateway values for the
  * required values.
  *
@@ -1709,36 +1709,36 @@ fhandler_socket::ioctl (unsigned int cmd, void *p)
     case SIOCGIFNETMASK:
     case SIOCGIFADDR:
       {
-        char buf[2048];
-        struct ifconf ifc;
-        ifc.ifc_len = sizeof(buf);
-        ifc.ifc_buf = buf;
-        struct ifreq *ifrp;
-
-        struct ifreq *ifr = (struct ifreq *) p;
-        if (ifr == 0)
-          {
-            debug_printf("ifr == NULL\n");
-            set_errno (EINVAL);
-            return -1;
-          }
+	char buf[2048];
+	struct ifconf ifc;
+	ifc.ifc_len = sizeof(buf);
+	ifc.ifc_buf = buf;
+	struct ifreq *ifrp;
+
+	struct ifreq *ifr = (struct ifreq *) p;
+	if (ifr == 0)
+	  {
+	    debug_printf("ifr == NULL\n");
+	    set_errno (EINVAL);
+	    return -1;
+	  }
 
 	res = get_ifconf (&ifc, cmd);
-        if (res)
+	if (res)
 	  {
 	    debug_printf ("error in get_ifconf\n");
 	    break;
 	  }
 
-        debug_printf("    name: %s\n", ifr->ifr_name);
-        for (ifrp = ifc.ifc_req;
-             (caddr_t) ifrp < ifc.ifc_buf + ifc.ifc_len;
-             ++ifrp)
-          {
-            debug_printf("testname: %s\n", ifrp->ifr_name);
-            if (! strcmp (ifrp->ifr_name, ifr->ifr_name))
-              {
-                switch (cmd)
+	debug_printf("    name: %s\n", ifr->ifr_name);
+	for (ifrp = ifc.ifc_req;
+	     (caddr_t) ifrp < ifc.ifc_buf + ifc.ifc_len;
+	     ++ifrp)
+	  {
+	    debug_printf("testname: %s\n", ifrp->ifr_name);
+	    if (! strcmp (ifrp->ifr_name, ifr->ifr_name))
+	      {
+		switch (cmd)
 		  {
 		  case SIOCGIFADDR:
 		    ifr->ifr_addr = ifrp->ifr_addr;
@@ -1750,15 +1750,15 @@ fhandler_socket::ioctl (unsigned int cmd, void *p)
 		    ifr->ifr_netmask = ifrp->ifr_netmask;
 		    break;
 		  }
-                break;
-              }
-          }
-        if ((caddr_t) ifrp >= ifc.ifc_buf + ifc.ifc_len)
-          {
-            set_errno (EINVAL);
-            return -1;
-          }
-        break;
+		break;
+	      }
+	  }
+	if ((caddr_t) ifrp >= ifc.ifc_buf + ifc.ifc_len)
+	  {
+	    set_errno (EINVAL);
+	    return -1;
+	  }
+	break;
       }
     case FIOASYNC:
       res = WSAAsyncSelect (get_socket (), gethwnd (), WM_ASYNCIO,