mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-28 07:41:05 +00:00
51702635af
* locale/categories.def: Change type of _NL_CTYPE_CLASS_NAMES and _NL_CTYPE_MAP_NAMES field to stringlist. Change name of _NL_CTYPE_CODESET_NAME to "charmap". * locale/localeinfo.h (enum value_type): Add stringlist. * locale/programs/locale.c (show_info): Handle stringlist. * locale/programs/charmap.c (charmap_read): If charmap file is not using the given name try to find it by looking through all available charmap files and compare the code set name. * locale/programs/locale.c (write_charmaps): Also print names of charset in <code_set_name> fields in the files. * elf/ldd.bash.in: Correct translatable strings. * posix/TESTS: Add some more tests for character class matching. * posix/regex.c: Merge with GNU awk version. (regex_compile): Use ISO C/amend 1 functions for character class handling. * posix/regex.h: Merge with GNU awk version. * posix/getopt.c: Declare as master copies. * posix/getopt1.c: Likewise. * posix/getopt.h: Likewise. * sysdeps/unix/sysv/linux/sys/mount.h: Add definitions for option value to mount functions. Patch by a sun <asun@zoology.washington.edu>. * stdio-common/bug4.c (main): Use /tmp/bug4.test for concurrency with other tests. * sunrpc/svc_run.c (svc_exit): New, defined. (svc_run): Test for svc_stop variable. * sysdeps/m68k/s_cexp.c: Rewritten. * sysdeps/m68k/s_cexpf.c: Likewise. * sysdeps/m68k/s_cexpl.c: Likewise.
146 lines
3.4 KiB
C
146 lines
3.4 KiB
C
/* Copyright (c) 1997 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
|
|
|
|
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 <string.h>
|
|
#include <rpcsvc/nis.h>
|
|
#include <rpcsvc/nislib.h>
|
|
#include "nis_intern.h"
|
|
|
|
/* Nearly the same as nis_getnames, but nis_getnames stopped
|
|
when 2 points left */
|
|
nis_name *
|
|
__nis_expandname (const char *name)
|
|
{
|
|
nis_name *getnames = NULL;
|
|
char local_domain[NIS_MAXNAMELEN + 1];
|
|
char *path, *cp;
|
|
int count, pos;
|
|
|
|
strncpy (local_domain, nis_local_directory (), NIS_MAXNAMELEN);
|
|
local_domain[NIS_MAXNAMELEN] = '\0';
|
|
|
|
count = 1;
|
|
if ((getnames = malloc ((count + 1) * sizeof (char *))) == NULL)
|
|
return NULL;
|
|
|
|
/* Do we have a fully qualified NIS+ name ? If yes, give it back */
|
|
if (name[strlen (name) - 1] == '.')
|
|
{
|
|
if ((getnames[0] = strdup (name)) == NULL)
|
|
{
|
|
free (getnames);
|
|
return NULL;
|
|
}
|
|
getnames[1] = NULL;
|
|
|
|
return getnames;
|
|
}
|
|
|
|
/* Get the search path, where we have to search "name" */
|
|
path = getenv ("NIS_PATH");
|
|
if (path == NULL)
|
|
path = strdupa ("$");
|
|
else
|
|
path = strdupa (path);
|
|
|
|
pos = 0;
|
|
|
|
cp = strtok (path, ":");
|
|
while (cp)
|
|
{
|
|
if (strcmp (cp, "$") == 0)
|
|
{
|
|
char *cptr = local_domain;
|
|
char *tmp;
|
|
|
|
while (*cptr != '\0')
|
|
{
|
|
if (pos >= count)
|
|
{
|
|
count += 5;
|
|
getnames = realloc (getnames, (count + 1) * sizeof (char *));
|
|
}
|
|
tmp = malloc (strlen (cptr) + strlen (local_domain) +
|
|
strlen (name) + 2);
|
|
if (tmp == NULL)
|
|
return NULL;
|
|
|
|
getnames[pos] = tmp;
|
|
tmp = stpcpy (tmp, name);
|
|
if (*cptr != '.')
|
|
*tmp++ = '.';
|
|
stpcpy (tmp, cptr);
|
|
|
|
++pos;
|
|
|
|
++cptr;
|
|
while ((*cptr != '\0') && (*cptr != '.'))
|
|
++cptr;
|
|
|
|
if ((*cptr == '.') && (cptr[1] != '\0'))
|
|
++cptr;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
char *tmp;
|
|
|
|
if (cp[strlen (cp) - 1] == '$')
|
|
{
|
|
tmp = malloc (strlen (cp) + strlen (local_domain) +
|
|
strlen (name) + 2);
|
|
if (tmp == NULL)
|
|
return NULL;
|
|
|
|
getnames[pos] = tmp;
|
|
tmp = stpcpy (tmp, name);
|
|
*tmp++ = '.';
|
|
tmp = stpcpy (tmp, cp);
|
|
--tmp;
|
|
if (tmp[- 1] != '.')
|
|
*tmp++ = '.';
|
|
stpcpy (tmp, local_domain);
|
|
}
|
|
else
|
|
{
|
|
tmp = malloc (strlen (cp) + strlen (name) + 2);
|
|
if (tmp == NULL)
|
|
return NULL;
|
|
|
|
tmp = stpcpy (tmp, name);
|
|
*tmp++ = '.';
|
|
stpcpy (tmp, cp);
|
|
}
|
|
|
|
if (pos > count)
|
|
{
|
|
count += 5;
|
|
getnames = realloc (getnames, (count + 1) * sizeof (char *));
|
|
}
|
|
getnames[pos] = tmp;
|
|
pos++;
|
|
}
|
|
cp = strtok (NULL, ":");
|
|
}
|
|
|
|
getnames[pos] = NULL;
|
|
|
|
return getnames;
|
|
}
|