aboutsummaryrefslogtreecommitdiff
path: root/grp
diff options
context:
space:
mode:
Diffstat (limited to 'grp')
-rw-r--r--grp/Makefile7
-rw-r--r--grp/fgetgrent.c50
-rw-r--r--grp/getgrent.c59
-rw-r--r--grp/getgrent_r.c30
-rw-r--r--grp/getgrgid.c30
-rw-r--r--grp/getgrgid_r.c30
-rw-r--r--grp/getgrnam.c30
-rw-r--r--grp/getgrnam_r.c (renamed from grp/grpopen.c)23
-rw-r--r--grp/grpread.c166
9 files changed, 147 insertions, 278 deletions
diff --git a/grp/Makefile b/grp/Makefile
index 6444aab..273b7d1 100644
--- a/grp/Makefile
+++ b/grp/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -21,8 +21,9 @@
#
subdir := grp
-routines := grpopen grpread fgetgrent getgrent getgrgid getgrnam \
- initgroups setgroups
+routines := fgetgrent initgroups setgroups \
+ getgrent getgrgid getgrnam \
+ getgrent_r getgrgid_r getgrnam_r
tests := testgrp
diff --git a/grp/fgetgrent.c b/grp/fgetgrent.c
index bef3e3f..031ccb9 100644
--- a/grp/fgetgrent.c
+++ b/grp/fgetgrent.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -16,26 +16,48 @@ License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
-#include <ansidecl.h>
-#include <errno.h>
-#include <stddef.h>
#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <grp.h>
+/* Define a line parsing function using the common code
+ used in the nss_files module. */
-/* Read a group entry from STREAM. */
+#define STRUCTURE group
+#define ENTNAME grent
+struct grent_data {};
+
+#define TRAILING_LIST_MEMBER gr_mem
+#define TRAILING_LIST_SEPARATOR_P(c) ((c) == ',')
+#include "../nss/nss_files/files-parse.c"
+LINE_PARSER
+(
+ STRING_FIELD (result->gr_name, ISCOLON);
+ STRING_FIELD (result->gr_passwd, ISCOLON);
+ INT_FIELD (result->gr_gid, ISCOLON, 10,);
+)
+
+
+/* Read one entry from the given stream. */
struct group *
-DEFUN(fgetgrent, (stream), FILE *stream)
+fgetgrent (FILE *stream)
{
- static PTR info = NULL;
- if (info == NULL)
+ static char buffer[BUFSIZ];
+ static struct group result;
+ char *p;
+
+ do
{
- info = __grpalloc();
- if (info == NULL)
+ p = fgets (buffer, sizeof buffer, stream);
+ if (p == NULL)
return NULL;
- }
- return __grpread(stream, info);
+ /* Skip leading blanks. */
+ while (isspace (*p))
+ ++p;
+ } while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
+ /* Parse the line. If it is invalid, loop to
+ get the next line of the file to parse. */
+ ! parse_line (p, &result, (void *) buffer, sizeof buffer));
+
+ return &result;
}
diff --git a/grp/getgrent.c b/grp/getgrent.c
index 105572f..4e14bbc 100644
--- a/grp/getgrent.c
+++ b/grp/getgrent.c
@@ -1,5 +1,6 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1996 Free Software Foundation, Inc.
This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
@@ -13,55 +14,17 @@ Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
-#include <ansidecl.h>
-#include <stddef.h>
-#include <stdio.h>
#include <grp.h>
-static FILE *stream = NULL;
-/* Rewind the stream. */
-void
-DEFUN_VOID(setgrent)
-{
- if (stream != NULL)
- rewind(stream);
-}
+#define LOOKUP_TYPE struct group
+#define SETFUNC_NAME setgrent
+#define GETFUNC_NAME getgrent
+#define ENDFUNC_NAME endgrent
+#define DATABASE_NAME group
+#define BUFLEN 1024
-
-/* Close the stream. */
-void
-DEFUN_VOID(endgrent)
-{
- if (stream != NULL)
- {
- (void) fclose(stream);
- stream = NULL;
- }
-}
-
-
-/* Read an entry from the stream. */
-struct group *
-DEFUN_VOID(getgrent)
-{
- static PTR info = NULL;
- if (info == NULL)
- {
- info = __grpalloc();
- if (info == NULL)
- return(NULL);
- }
-
- if (stream == NULL)
- {
- stream = __grpopen();
- if (stream == NULL)
- return(NULL);
- }
-
- return(__grpread(stream, info));
-}
+#include "../nss/getXXent.c"
diff --git a/grp/getgrent_r.c b/grp/getgrent_r.c
new file mode 100644
index 0000000..db692b2
--- /dev/null
+++ b/grp/getgrent_r.c
@@ -0,0 +1,30 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB. If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
+
+#include <grp.h>
+
+
+#define LOOKUP_TYPE struct group
+#define SETFUNC_NAME setgrent
+#define GETFUNC_NAME getgrent
+#define ENDFUNC_NAME endgrent
+#define DATABASE_NAME group
+#define BUFLEN 1024
+
+#include "../nss/getXXent_r.c"
diff --git a/grp/getgrgid.c b/grp/getgrgid.c
index ef3860f..855d31c 100644
--- a/grp/getgrgid.c
+++ b/grp/getgrgid.c
@@ -1,5 +1,6 @@
-/* Copyright (C) 1991, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1996 Free Software Foundation, Inc.
This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
@@ -13,24 +14,17 @@ Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
-#include <ansidecl.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <sys/types.h>
#include <grp.h>
-/* Search for an entry with a matching group ID. */
-struct group *
-DEFUN(getgrgid, (gid), gid_t gid)
-{
- int match (struct group *p)
- {
- return p->gr_gid == gid;
- }
- static void *info;
- return __grpscan (&info, &match);
-}
+#define LOOKUP_TYPE struct group
+#define FUNCTION_NAME getgrgid
+#define DATABASE_NAME group
+#define ADD_PARAMS gid_t gid
+#define ADD_VARIABLES gid
+#define BUFLEN 1024
+
+#include "../nss/getXXbyYY.c"
diff --git a/grp/getgrgid_r.c b/grp/getgrgid_r.c
new file mode 100644
index 0000000..1d5f1a4
--- /dev/null
+++ b/grp/getgrgid_r.c
@@ -0,0 +1,30 @@
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB. If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
+
+#include <grp.h>
+
+
+#define LOOKUP_TYPE struct passwd
+#define FUNCTION_NAME getgrgid
+#define DATABASE_NAME group
+#define ADD_PARAMS gid_t gid
+#define ADD_VARIABLES gid
+#define BUFLEN 1024
+
+#include "../nss/getXXbyYY_r.c"
diff --git a/grp/getgrnam.c b/grp/getgrnam.c
index 8416770..2104d87 100644
--- a/grp/getgrnam.c
+++ b/grp/getgrnam.c
@@ -1,5 +1,6 @@
-/* Copyright (C) 1991, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1996 Free Software Foundation, Inc.
This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
@@ -13,24 +14,17 @@ Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
-#include <ansidecl.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
#include <grp.h>
-/* Search for an entry with a matching name. */
-struct group *
-DEFUN(getgrnam, (name), const char *name)
-{
- int match (struct group *p)
- {
- return ! strcmp (name, p->gr_name);
- }
- static void *info;
- return __grpscan (&info, &match);
-}
+#define LOOKUP_TYPE struct group
+#define FUNCTION_NAME getgrnam
+#define DATABASE_NAME group
+#define ADD_PARAMS const char *name
+#define ADD_VARIABLES name
+#define BUFLEN 1024
+
+#include "../nss/getXXbyYY.c"
diff --git a/grp/grpopen.c b/grp/getgrnam_r.c
index 77d1597..c1292bb 100644
--- a/grp/grpopen.c
+++ b/grp/getgrnam_r.c
@@ -1,5 +1,6 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1996 Free Software Foundation, Inc.
This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
@@ -13,16 +14,16 @@ Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
-#include <ansidecl.h>
-#include <stdio.h>
#include <grp.h>
-/* Return a new stream open on the group file. */
-FILE *
-DEFUN_VOID(__grpopen)
-{
- return fopen("/etc/group", "r");
-}
+
+#define LOOKUP_TYPE struct group
+#define FUNCTION_NAME getgrnam
+#define DATABASE_NAME group
+#define ADD_PARAMS const char *name
+#define ADD_VARIABLES name
+
+#include "../nss/getXXbyYY_r.c"
diff --git a/grp/grpread.c b/grp/grpread.c
deleted file mode 100644
index 1fed32f..0000000
--- a/grp/grpread.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
-
-#include <ansidecl.h>
-#include <errno.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <grp.h>
-
-/* This is the function that all the others are based on.
- The format of the group file is known only here. */
-
-/* Structure containing info kept by each __grpread caller. */
-typedef struct
- {
- char *buf;
- size_t buflen;
- size_t max_members;
- char **members;
- struct group g;
- } grpread_info;
-
-
-/* Return a chunk of memory containing a pre-initialized `grpread_info'. */
-PTR
-DEFUN_VOID(__grpalloc)
-{
- grpread_info *info = (PTR) malloc (sizeof(grpread_info));
- if (info == NULL)
- return NULL;
-
- info->buf = NULL;
- info->buflen = 0;
-
- info->max_members = 5;
- info->members = (char **) malloc (5 * sizeof(char *));
- if (info->members == NULL)
- {
- free ((PTR) info);
- return NULL;
- }
-
- return info;
-}
-
-/* Read a group entry from STREAM, filling in G. */
-struct group *
-DEFUN(__grpread, (stream, g), FILE *stream AND PTR CONST g)
-{
- register grpread_info *CONST info = (grpread_info *) g;
- char *start, *end;
- register size_t i;
-
- /* Idiocy checks. */
- if (stream == NULL)
- {
- errno = EINVAL;
- return NULL;
- }
-
- do
- if (__getline (&info->buf, &info->buflen, stream) == -1)
- return NULL;
- while (info->buf[0] == '#');
-
- start = info->buf;
- end = strchr (start, ':');
- if (end == NULL)
- return NULL;
- *end = '\0';
- info->g.gr_name = start;
-
- start = end + 1;
- end = strchr (start, ':');
- if (end == NULL)
- return NULL;
- *end = '\0';
- info->g.gr_passwd = start;
-
- info->g.gr_gid = (gid_t) strtol (end + 1, &end, 10);
- if (*end != ':')
- return NULL;
-
- i = 0;
- do
- {
- start = end + 1;
- end = strchr (start, ',');
- if (end == NULL)
- {
- end = strchr (start, '\n');
- if (end == start)
- break;
- if (end == NULL)
- return NULL;
- *end = '\0';
- end = NULL;
- }
- else
- *end = '\0';
-
- if (i == info->max_members - 2)
- {
- info->max_members += 5;
- info->members = (char **)
- realloc ((PTR) info->members, info->max_members * sizeof (char *));
- if (info->members == NULL)
- return NULL;
- }
-
- info->members[i++] = start;
- } while (end != NULL);
- info->members[i] = NULL;
- info->g.gr_mem = info->members;
-
- return &info->g;
-}
-
-
-struct group *
-__grpscan (void **info, int (*selector) (struct group *))
-{
- FILE *stream;
- struct group *p;
-
- if (*info == NULL)
- {
- *info = __grpalloc ();
- if (info == NULL)
- return NULL;
- }
-
- stream = __grpopen ();
- if (stream == NULL)
- return NULL;
-
- p = NULL;
- while (! feof (stream))
- {
- p = __grpread (stream, *info);
- if (p && (*selector) (p))
- break;
- p = NULL;
- }
-
- (void) fclose (stream);
- return p;
-}