* grp.cc (getgrent32): Only refresh group entries when at beginning.

(internal_getgrsid): Only refresh if uninitialized.
(internal_getgrent): Ditto.
* passwd.cc (getpwent): Only refresh passwd entries when at beginning.
(pwdgrp::read_passwd): linebuf *cannot* be NO_COPY.
(internal_getpwsid): Only refresh if uninitialized.
(getpass): No need to refresh passwd data here.
* pwdgrp.h (refresh): Eliminate default.
This commit is contained in:
Christopher Faylor
2003-02-01 18:41:29 +00:00
parent 05d2a9a4fb
commit 6688a0618e
4 changed files with 21 additions and 11 deletions

View File

@@ -82,7 +82,8 @@ pwdgrp::read_passwd ()
myself->uid != (__uid32_t) pw->pw_uid &&
!internal_getpwuid (myself->uid))))
{
static char NO_COPY linebuf[1024]; // must be static
static char linebuf[1024]; // must be static and
// should not be NO_COPY
(void) cygheap->user.ontherange (CH_HOME, NULL);
snprintf (linebuf, sizeof (linebuf), "%s:*:%lu:%lu:,%s:%s:/bin/sh",
cygheap->user.name (),
@@ -102,7 +103,7 @@ internal_getpwsid (cygsid &sid)
char *ptr1, *ptr2, *endptr;
char sid_string[128] = {0,','};
pr.refresh ();
pr.refresh (false);
if (sid.string (sid_string + 2))
{
@@ -252,8 +253,8 @@ getpwnam_r (const char *nam, struct passwd *pwd, char *buffer, size_t bufsize, s
extern "C" struct passwd *
getpwent (void)
{
pr.refresh ();
if (pw_pos == 0)
pr.refresh (true);
if (pw_pos < pr.curr_lines)
return passwd_buf + pw_pos++;
@@ -290,8 +291,6 @@ getpass (const char * prompt)
char *pass=_reent_winsup ()->_pass;
struct termios ti, newti;
pr.refresh ();
cygheap_fdget fhstdin (0);
if (fhstdin < 0)