X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fuserspec.c;h=d08ed07165e7e929b5e1a2b894b041de0641911d;hb=6d8337bfc808cddc275899c03482eceb6aff8547;hp=c5ac3096c475a35b3e623db87f4f422da542bb65;hpb=cfb5e51faef97f4735e772e8ef0ab6161c3eba25;p=gnulib.git

diff --git a/lib/userspec.c b/lib/userspec.c
index c5ac3096c..d08ed0716 100644
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -12,8 +12,8 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
@@ -63,9 +63,12 @@ struct group *getgrnam ();
 struct group *getgrgid ();
 #endif
 
-#ifdef _POSIX_SOURCE
-#define endpwent()
-#define endgrent()
+#ifndef HAVE_ENDGRENT
+# define endgrent() ((void) 0)
+#endif
+
+#ifndef HAVE_ENDPWENT
+# define endpwent() ((void) 0)
 #endif
 
 /* Perform the equivalent of the statement `dest = strdup (src);',
@@ -88,7 +91,7 @@ char *strdup ();
    otherwise return 0. */
 
 static int
-isnumber (str)
+is_number (str)
      const char *str;
 {
   for (; *str; str++)
@@ -156,7 +159,7 @@ parse_user_spec (spec_arg, uid, gid, username_arg, groupname_arg)
       if (pwd == NULL)
 	{
 
-	  if (!isnumber (u))
+	  if (!is_number (u))
 	    error_msg = "invalid user";
 	  else
 	    {
@@ -202,7 +205,7 @@ parse_user_spec (spec_arg, uid, gid, username_arg, groupname_arg)
       grp = getgrnam (g);
       if (grp == NULL)
 	{
-	  if (!isnumber (g))
+	  if (!is_number (g))
 	    error_msg = "invalid group";
 	  else
 	    *gid = atoi (g);