* pwdgrp.h (etc): Move to path.h.

(pwdgrp::max_lines): New field.
(pwdgrp::curr_lines): New field.
(pwdgrp::pwdgrp_buf): Ditto.
(pwdgrp_buf_elem_size): Ditto.
(pwdgrp_parse): Ditto.
(pwdgrp::gets): Just declare here.
(pwdgrp::load): Ditto.  Just take one argument.
(pwdgrp::load): Define overloaded function accepting passwd buf.
(pwdgrp::load): Define overloaded function accepting group buf.
* grp.cc: Use pwdgrp elements rather than standalone static variables
throughout.
(curr_lines): Eliminate.
(max_lines): Ditto.
(add_grp_line): Ditto.
(parse_grp): Define as returning boolean.  Accept void * arg and line count.
Coerce first argument into __group32 buf reference.  Increment curr_line as
appropriate.
(read_etc_group): Pass pwdgrp buffer to gr.load.
* passwd.cc: Use pwdgrp elements rather than standalone static variables
throughout.
(curr_lines): Eliminate.
(max_lines): Ditto.
(add_grp_line): Ditto.
(parse_passwd): Define as returning boolean.  Accept void * arg and line count.
Coerce first argument into passwd buf reference.  Increment curr_line as
appropriate.
(read_etc_group): Pass pwdgrp buffer to pr.load.
* path.cc (etc::fn): Extend buffer size to allow index by 1 rather than zero.
(etc::last_modified): Ditto.
(etc::change_possible): Ditto.  Renamed from sawchange.  Change to signed char
since elements are now tri-state.
(etc::init): Assume "handle" is 1 based rather than 0.
(etc::test_file_change): New function.  Sets change_possible based on file date
comparison.
(etc::dir_changed): Check file states immediately after changed_h is
initialized to avoid a race.
(etc::file_changed): Use test_file_change to detect if file needs to be
updated.
* path.h (etc): Move class here from pwdgrp.h.
* uinfo.cc: Move etc:: functions to path.cc.  Move pwdgrp functions here.
(pwdgrp::gets): Eliminate buf checks.  Just check eptr and set lptr.
(pwdgrp::add_line): New function.
(pwdgrp::load): Call generic add_line function which will call correct parser.

1 files changed, 17 insertions, 31 deletions

diff --git a/winsup/cygwin/passwd.cc b/winsup/cygwin/passwd.cc
index 113255afb..91cbfa62f 100644
--- a/winsup/cygwin/passwd.cc
+++ b/winsup/cygwin/passwd.cc
@@ -26,11 +26,8 @@ details. */
 /* Read /etc/passwd only once for better performance.  This is done
    on the first call that needs information from it. */
 
-static struct passwd NO_COPY *passwd_buf;	/* passwd contents in memory */
-static int NO_COPY curr_lines;
-static int NO_COPY max_lines;
-
-static NO_COPY pwdgrp pr;
+static pwdgrp pr;
+passwd *passwd_buf;
 
 /* Position in the passwd cache */
 #define pw_pos  _reent_winsup ()->_pw_pos
@@ -65,9 +62,10 @@ grab_int (char **p)
 }
 
 /* Parse /etc/passwd line into passwd structure. */
-static int
-parse_pwd (struct passwd &res, char *buf)
+bool
+pwdgrp::parse_pwd (char *buf)
 {
+# define res (*passwd_buf)[curr_lines]
   /* Allocate enough room for the passwd struct and all the strings
      in it in one go */
   res.pw_name = grab_string (&buf);
@@ -75,25 +73,14 @@ parse_pwd (struct passwd &res, char *buf)
   res.pw_uid = grab_int (&buf);
   res.pw_gid = grab_int (&buf);
   if (!*buf)
-    return 0;
+    return false;
   res.pw_comment = 0;
   res.pw_gecos = grab_string (&buf);
   res.pw_dir =  grab_string (&buf);
   res.pw_shell = grab_string (&buf);
-  return 1;
-}
-
-/* Add one line from /etc/passwd into the password cache */
-static void
-add_pwd_line (char *line)
-{
-    if (curr_lines >= max_lines)
-      {
-	max_lines += 10;
-	passwd_buf = (struct passwd *) realloc (passwd_buf, max_lines * sizeof (struct passwd));
-      }
-    if (parse_pwd (passwd_buf[curr_lines], line))
-      curr_lines++;
+  curr_lines++;
+  return true;
+# undef res
 }
 
 class passwd_lock
@@ -131,8 +118,7 @@ read_etc_passwd ()
   /* if we got blocked by the mutex, then etc_passwd may have been processed */
   if (pr.isinitializing ())
     {
-      curr_lines = 0;
-      if (!pr.load ("/etc/passwd", add_pwd_line))
+      if (!pr.load ("/etc/passwd", passwd_buf))
 	debug_printf ("pr.load failed");
 
       char strbuf[128] = "";
@@ -141,8 +127,8 @@ read_etc_passwd ()
 
       if (wincap.has_security ())
 	{
-	  static char pretty_ls[] = "????????:*:-1:-1:";
-	  add_pwd_line (pretty_ls);
+	  static char NO_COPY pretty_ls[] = "????????:*:-1:-1:";
+	  pr.add_line (pretty_ls);
 	  cygsid tu = cygheap->user.sid ();
 	  tu.string (strbuf);
 	  if (myself->uid == ILLEGAL_UID)
@@ -164,7 +150,7 @@ read_etc_passwd ()
 		    myself->gid,
 		    strbuf, getenv ("HOME") ?: "");
 	  debug_printf ("Completing /etc/passwd: %s", linebuf);
-	  add_pwd_line (linebuf);
+	  pr.add_line (linebuf);
 	}
     }
   return;
@@ -183,7 +169,7 @@ internal_getpwsid (cygsid &sid)
   if (sid.string (sid_string + 2))
     {
       endptr = strchr (sid_string + 2, 0) - 1;
-      for (int i = 0; i < curr_lines; i++)
+      for (int i = 0; i < pr.curr_lines; i++)
 	if ((pw = passwd_buf + i)->pw_dir > pw->pw_gecos + 8)
 	  for (ptr1 = endptr, ptr2 = pw->pw_dir - 2;
 	       *ptr1 == *ptr2; ptr2--)
@@ -199,7 +185,7 @@ internal_getpwuid (__uid32_t uid, bool check)
   if (pr.isuninitialized () || (check && pr.isinitializing ()))
     read_etc_passwd ();
 
-  for (int i = 0; i < curr_lines; i++)
+  for (int i = 0; i < pr.curr_lines; i++)
     if (uid == (__uid32_t) passwd_buf[i].pw_uid)
       return passwd_buf + i;
   return NULL;
@@ -211,7 +197,7 @@ internal_getpwnam (const char *name, bool check)
   if (pr.isuninitialized () || (check && pr.isinitializing ()))
     read_etc_passwd ();
 
-  for (int i = 0; i < curr_lines; i++)
+  for (int i = 0; i < pr.curr_lines; i++)
     /* on Windows NT user names are case-insensitive */
     if (strcasematch (name, passwd_buf[i].pw_name))
       return passwd_buf + i;
@@ -333,7 +319,7 @@ getpwent (void)
   if (pr.isinitializing ())
     read_etc_passwd ();
 
-  if (pw_pos < curr_lines)
+  if (pw_pos < pr.curr_lines)
     return passwd_buf + pw_pos++;
 
   return NULL;