* cygheap.cc (cygheap_root::cygheap_root): New function.

        (cygheap_root::~cygheap_root): Ditto.
        (cygheap_root::operator=): Ditto.
        (cygheap_user::~cygheap_user): Ditto.
        (cygheap_user::set_name): Ditto.
        (cygheap_user::set_logsrv): Ditto.
        (cygheap_user::set_domain): Ditto.
        (cygheap_user::set_sid): Ditto.
        * cygheap.h (cygheap_root): New class.
        (cygheap_user): Ditto.
        (init_cygheap): Change type of `root' member to cygheap_root.
        Add `user' member.
        * dir.cc (opendir): Use new `cygheap_root' class.
        * dcrt0.cc (dll_crt0_1): Use new `cygheap_user' class.
        * fork.cc (fork_parent): Ditto.
        * grp.cc (getgroups): Ditto.
        * passwd.cc (search_for): Ditto.
        * path.cc: Use new `cygheap_root' class throughout.
        * pinfo.h (_pinfo): Remove `use_psid'. Move `username', `psid',
        `logsrv', `domain', `orig_{uid,gid}' and `real_{uid,gid}' to
        cygheap_user class.
        * security.cc: Use new `cygheap_user' class throughout.
        * shared.cc (sec_user): Ditto.
        * sigproc.cc (proc_subproc): Remove copy statements for user
        related information moved to `cygheap_user' class.
        * spawn.cc (spawn_guts): Invalidate current chroot settings
        when creating Windows environment. Use new `cygheap_user' class.
        * syscalls.cc: Use new `cygheap_user' class throughout.
        * uinfo.cc: Ditto.
        * uinfo.cc (internal_getlogin): Change parameters to reflect the
        move of user information to cygheap.

1 files changed, 90 insertions, 0 deletions

diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
index 15c2667c0..0d720e9d5 100644
--- a/winsup/cygwin/cygheap.cc
+++ b/winsup/cygwin/cygheap.cc
@@ -279,3 +279,93 @@ cstrdup1 (const char *s)
   MALLOC_CHECK;
   return p;
 }
+
+cygheap_root::cygheap_root (cygheap_root &nroot)
+{
+  rootlen = nroot.rootlen;
+  root = nroot.root ? cstrdup (nroot.root) : NULL;
+}
+
+cygheap_root::~cygheap_root ()
+{
+  if (root)
+    cfree (root);
+}
+
+char *
+cygheap_root::operator =(const char *new_root)
+{
+  if (root)
+    {
+      cfree (root);
+      root = NULL;
+    }
+  rootlen = 0;
+  if (new_root && *new_root)
+    {
+      root = cstrdup (new_root);
+      rootlen = strlen (root);
+      if (rootlen > 1 && root[rootlen - 1] == '/')
+	root[--rootlen] = '\0';
+      if (!rootlen)
+	{
+	  cfree (root);
+	  root = NULL;
+	}
+    }
+  return root;
+}
+
+cygheap_user::~cygheap_user ()
+{
+  if (pname)
+    cfree (pname);
+  if (plogsrv)
+    cfree (plogsrv);
+  if (pdomain)
+    cfree (pdomain);
+  if (psid)
+    cfree (psid);
+}
+
+void
+cygheap_user::set_name (const char *new_name)
+{
+  if (pname)
+    cfree (pname);
+  pname = cstrdup (new_name ? new_name : "");
+}
+
+void
+cygheap_user::set_logsrv (const char *new_logsrv)
+{
+  if (plogsrv)
+    cfree (plogsrv);
+  plogsrv = (new_logsrv && *new_logsrv) ? cstrdup (new_logsrv) : NULL;
+}
+
+void
+cygheap_user::set_domain (const char *new_domain)
+{
+  if (pdomain)
+    cfree (pdomain);
+  pdomain = (new_domain && *new_domain) ? cstrdup (new_domain) : NULL;
+}
+
+BOOL
+cygheap_user::set_sid (PSID new_sid)
+{
+  if (!new_sid)
+    {
+      if (psid)
+        cfree (psid);
+      psid = NULL;
+      return TRUE;
+    }
+  else
+    {
+      if (!psid)
+	psid = cmalloc (HEAP_STR, MAX_SID_LEN);
+      return CopySid (MAX_SID_LEN, psid, new_sid);
+    }
+}