aboutsummaryrefslogtreecommitdiff
path: root/nss/getent.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-08-16 16:05:37 +0000
committerUlrich Drepper <drepper@redhat.com>2005-08-16 16:05:37 +0000
commitb4f6f4be85d32b9c03361c38376e36f08100e3e8 (patch)
treef785fc1acefcaa7026ee3e6a3d31f5b8ec5bdf2f /nss/getent.c
parent908c9e87c3b639c8d1660a5c1a22c962634c6332 (diff)
downloadglibc-b4f6f4be85d32b9c03361c38376e36f08100e3e8.zip
glibc-b4f6f4be85d32b9c03361c38376e36f08100e3e8.tar.gz
glibc-b4f6f4be85d32b9c03361c38376e36f08100e3e8.tar.bz2
[BZ #1188]
2005-08-10 Sergio Gelato <Sergio.Gelato@astro.su.se> [BZ #1188] * nis/nss_nis/nis-netgrp.c (_nss_nis_setnetgrent): Change assert check from (len > 0) to (len >= 0). 2005-08-16 Ulrich Drepper <drepper@redhat.com> * nis/nis_xdr.c (_xdr_nis_result): Fix type of res variable. Reported by Thomas Schwinge. 2005-08-15 Jakub Jelinek <jakub@redhat.com> * nis/nis_subr.c (nis_leaf_of_r): Handle buflen == 0 correctly. 2005-08-16 Ulrich Drepper <drepper@redhat.com> * nss/getent.c (more_help): Use open_memstream instead of handling memory allocation ourselves. 2005-08-16 Jay Fenlason <fenlason@redhat.com> * nss/getent.c (parse_options): change the -s option to support {database}:{search} to override /etc/resolv.conf for only the specified database.
Diffstat (limited to 'nss/getent.c')
-rw-r--r--nss/getent.c57
1 files changed, 31 insertions, 26 deletions
diff --git a/nss/getent.c b/nss/getent.c
index 0aea5ee..7124e63 100644
--- a/nss/getent.c
+++ b/nss/getent.c
@@ -757,12 +757,27 @@ D(shadow)
static error_t
parse_option (int key, char *arg, struct argp_state *state)
{
- int i;
+ char *endp;
switch (key)
{
case 's':
- for (i = 0; databases[i].name; ++i)
- __nss_configure_lookup (databases[i].name, arg);
+ endp = strchr (arg, ':');
+ if (endp == NULL)
+ /* No specific database, change them all. */
+ for (int i = 0; databases[i].name != NULL; ++i)
+ __nss_configure_lookup (databases[i].name, arg);
+ else
+ {
+ int i;
+ for (i = 0; databases[i].name != NULL; ++i)
+ if (strncmp (databases[i].name, arg, endp - arg) == 0)
+ {
+ __nss_configure_lookup (databases[i].name, endp + 1);
+ break;
+ }
+ if (databases[i].name == NULL)
+ error (EXIT_FAILURE, 0, gettext ("Unknown database name"));
+ }
break;
default:
@@ -776,31 +791,20 @@ parse_option (int key, char *arg, struct argp_state *state)
static char *
more_help (int key, const char *text, void *input)
{
- int len;
- char *long_doc, *doc, *p;
-
switch (key)
{
+ size_t len;
+ char *doc;
+ FILE *fp;
+
case ARGP_KEY_HELP_EXTRA:
/* We print some extra information. */
-#if 0
- return xstrdup (gettext ("\
-For bug reporting instructions, please see:\n\
-<http://www.gnu.org/software/libc/bugs.html>.\n"));
-#endif
- long_doc = _("Supported databases:");
- len = strlen (long_doc) + 2;
-
- for (int i = 0; databases[i].name; ++i)
- len += strlen (databases[i].name) + 1;
-
- doc = (char *) malloc (len);
- if (doc != NULL)
+ fp = open_memstream (&doc, &len);
+ if (fp != NULL)
{
- p = stpcpy (doc, long_doc);
- *p++ = '\n';
+ fputs_unlocked (_("Supported databases:\n"), fp);
- for (int i = 0, col = 0; databases[i].name; ++i)
+ for (int i = 0, col = 0; databases[i].name != NULL; ++i)
{
len = strlen (databases[i].name);
if (i != 0)
@@ -808,17 +812,18 @@ For bug reporting instructions, please see:\n\
if (col + len > 72)
{
col = 0;
- *p++ = '\n';
+ fputc_unlocked ('\n', fp);
}
else
- *p++ = ' ';
+ fputc_unlocked (' ', fp);
}
- p = mempcpy (p, databases[i].name, len);
+ fputs_unlocked (databases[i].name, fp);
col += len + 1;
}
- return doc;
+ if (fclose (fp) == 0)
+ return doc;
}
break;