drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* grp.cc (pwdgrp::parse_group): Convert grp from macro to reference. 

* passwd.cc (pwdgrp::parse_passwd): Ditto for res.
This commit is contained in:
Corinna Vinschen 2012-02-03 12:26:08 +00:00
parent ab1fb53505
commit 02f63d4720
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2012-02-03 Václav Zeman <vhaisman@gmail.com>
* grp.cc (pwdgrp::parse_group): Convert grp from macro to reference.
* passwd.cc (pwdgrp::parse_passwd): Ditto for res.
2012-02-02 Christopher Faylor <me.cygwin2012@cgf.cx> 2012-02-02 Christopher Faylor <me.cygwin2012@cgf.cx>
* syscalls.cc (close_all_files): Use cygheap_fdget to manipulate * syscalls.cc (close_all_files): Use cygheap_fdget to manipulate

5
winsup/cygwin/grp.cc
View File

@ -1,7 +1,7 @@
/* grp.cc /* grp.cc
Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
2007, 2008, 2009, 2011 Red Hat, Inc. 2007, 2008, 2009, 2011, 2012 Red Hat, Inc.
Original stubs by Jason Molenda of Cygnus Support, crash@cygnus.com Original stubs by Jason Molenda of Cygnus Support, crash@cygnus.com
First implementation by Gunther Ebert, gunther.ebert@ixos-leipzig.de First implementation by Gunther Ebert, gunther.ebert@ixos-leipzig.de
@ -32,7 +32,7 @@ static char * NO_COPY null_ptr;
bool bool
pwdgrp::parse_group () pwdgrp::parse_group ()
{ {
# define grp (*group_buf)[curr_lines] __group32 &grp = (*group_buf)[curr_lines];
grp.gr_name = next_str (':'); grp.gr_name = next_str (':');
if (!*grp.gr_name) if (!*grp.gr_name)
return false; return false;
@ -60,7 +60,6 @@ pwdgrp::parse_group ()
} }
return true; return true;
# undef grp
} }
/* Cygwin internal */ /* Cygwin internal */

6
winsup/cygwin/passwd.cc
View File

@ -1,6 +1,7 @@
/* passwd.cc: getpwnam () and friends /* passwd.cc: getpwnam () and friends
Copyright 1996, 1997, 1998, 2001, 2002, 2003, 2007, 2008, 2009 Red Hat, Inc. Copyright 1996, 1997, 1998, 2001, 2002, 2003, 2007, 2008, 2009,
2010, 2011 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -31,7 +32,7 @@ static pwdgrp pr (passwd_buf);
bool bool
pwdgrp::parse_passwd () pwdgrp::parse_passwd ()
{ {
# define res (*passwd_buf)[curr_lines] passwd &res = (*passwd_buf)[curr_lines];
res.pw_name = next_str (':'); res.pw_name = next_str (':');
res.pw_passwd = next_str (':'); res.pw_passwd = next_str (':');
if (!next_num (res.pw_uid)) if (!next_num (res.pw_uid))
@ -43,7 +44,6 @@ pwdgrp::parse_passwd ()
res.pw_dir = next_str (':'); res.pw_dir = next_str (':');
res.pw_shell = next_str (':'); res.pw_shell = next_str (':');
return true; return true;
# undef res
} }
/* Read in /etc/passwd and save contents in the password cache. /* Read in /etc/passwd and save contents in the password cache.