JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2000-08-29 Werner Almesberger <Werner.Almesberger@epfl.ch>

Browse Source 
* libc/unix/getpwent.c (getpwnam, getpwuid, getpwent): removed
        (broken) support for non-existent /etc/passwd field "comment".
This commit is contained in:
Jeff Johnston 2000-08-29 18:09:15 +00:00
parent d824bcf985
commit 00a2f168e7
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2000-08-29 Werner Almesberger <Werner.Almesberger@epfl.ch>
* libc/unix/getpwent.c (getpwnam, getpwuid, getpwent): removed
(broken) support for non-existent /etc/passwd field "comment".
2000-08-27 Werner Almesberger <Werner.Almesberger@epfl.ch> 2000-08-27 Werner Almesberger <Werner.Almesberger@epfl.ch>
* libc/posix/scandir.c (DIRSIZ, scandir): use struct dirent.d_namlen * libc/posix/scandir.c (DIRSIZ, scandir): use struct dirent.d_namlen

13
newlib/libc/unix/getpwent.c
View File

@ -12,7 +12,6 @@ static FILE *passwd_fp;
static char logname[8]; static char logname[8];
static char password[1024]; static char password[1024];
static char comment[1024];
static char gecos[1024]; static char gecos[1024];
static char dir[1024]; static char dir[1024];
static char shell[1024]; static char shell[1024];
@ -33,11 +32,11 @@ getpwnam (name)
{ {
sscanf (buf, "%[^:]:%[^:]:%d:%d:%[^:]:%[^:]:%s\n", sscanf (buf, "%[^:]:%[^:]:%d:%d:%[^:]:%[^:]:%s\n",
logname, password, &pw_passwd.pw_uid, logname, password, &pw_passwd.pw_uid,
&pw_passwd.pw_gid, comment, gecos, &pw_passwd.pw_gid, gecos,
dir, shell); dir, shell);
pw_passwd.pw_name = logname; pw_passwd.pw_name = logname;
pw_passwd.pw_passwd = password; pw_passwd.pw_passwd = password;
pw_passwd.pw_comment = comment; pw_passwd.pw_comment = "";
pw_passwd.pw_gecos = gecos; pw_passwd.pw_gecos = gecos;
pw_passwd.pw_dir = dir; pw_passwd.pw_dir = dir;
pw_passwd.pw_shell = shell; pw_passwd.pw_shell = shell;
@ -67,11 +66,11 @@ getpwuid (uid_t uid)
{ {
sscanf (buf, "%[^:]:%[^:]:%d:%d:%[^:]:%[^:]:%s\n", sscanf (buf, "%[^:]:%[^:]:%d:%d:%[^:]:%[^:]:%s\n",
logname, password, &pw_passwd.pw_uid, logname, password, &pw_passwd.pw_uid,
&pw_passwd.pw_gid, comment, gecos, &pw_passwd.pw_gid, gecos,
dir, shell); dir, shell);
pw_passwd.pw_name = logname; pw_passwd.pw_name = logname;
pw_passwd.pw_passwd = password; pw_passwd.pw_passwd = password;
pw_passwd.pw_comment = comment; pw_passwd.pw_comment = "";
pw_passwd.pw_gecos = gecos; pw_passwd.pw_gecos = gecos;
pw_passwd.pw_dir = dir; pw_passwd.pw_dir = dir;
pw_passwd.pw_shell = shell; pw_passwd.pw_shell = shell;
@ -99,11 +98,11 @@ getpwent ()
sscanf (buf, "%[^:]:%[^:]:%d:%d:%[^:]:%[^:]:%s\n", sscanf (buf, "%[^:]:%[^:]:%d:%d:%[^:]:%[^:]:%s\n",
logname, password, &pw_passwd.pw_uid, logname, password, &pw_passwd.pw_uid,
&pw_passwd.pw_gid, comment, gecos, &pw_passwd.pw_gid, gecos,
dir, shell); dir, shell);
pw_passwd.pw_name = logname; pw_passwd.pw_name = logname;
pw_passwd.pw_passwd = password; pw_passwd.pw_passwd = password;
pw_passwd.pw_comment = comment; pw_passwd.pw_comment = "";
pw_passwd.pw_gecos = gecos; pw_passwd.pw_gecos = gecos;
pw_passwd.pw_dir = dir; pw_passwd.pw_dir = dir;
pw_passwd.pw_shell = shell; pw_passwd.pw_shell = shell;