-/* Copyright (c) 1997 Free Software Foundation, Inc.
+/* Copyright (c) 1997-2013 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.
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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.
+ Lesser 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. */
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
#include <errno.h>
#include <string.h>
#include <rpcsvc/nis.h>
-#include <rpcsvc/nislib.h>
nis_name
-nis_leaf_of (const nis_name name)
+nis_leaf_of (const_nis_name name)
{
static char result[NIS_MAXNAMELEN + 1];
}
nis_name
-nis_leaf_of_r (const nis_name name, char *buffer, size_t buflen)
+nis_leaf_of_r (const_nis_name name, char *buffer, size_t buflen)
{
size_t i = 0;
while (name[i] != '.' && name[i] != '\0')
i++;
- if (i > buflen - 1)
+ if (__builtin_expect (i >= buflen, 0))
{
- errno = ERANGE;
+ __set_errno (ERANGE);
return NULL;
}
- if (i > 1)
- strncpy (buffer, name, i - 1);
+ *((char *) __mempcpy (buffer, name, i)) = '\0';
return buffer;
}
+libnsl_hidden_def (nis_leaf_of_r)
nis_name
-nis_name_of (const nis_name name)
+nis_name_of (const_nis_name name)
{
static char result[NIS_MAXNAMELEN + 1];
}
nis_name
-nis_name_of_r (const nis_name name, char *buffer, size_t buflen)
+nis_name_of_r (const_nis_name name, char *buffer, size_t buflen)
{
char *local_domain;
int diff;
if ((size_t) diff >= buflen)
{
- errno = ERANGE;
+ __set_errno (ERANGE);
return NULL;
}
- memcpy (buffer, name, diff - 1);
- buffer[diff - 1] = '\0';
+
+ *((char *) __mempcpy (buffer, name, diff - 1)) = '\0';
if (diff - 1 == 0)
return NULL;
return buffer;
}
+libnsl_hidden_def (nis_name_of_r)
-nis_name
-nis_domain_of (const nis_name name)
-{
- static char result[NIS_MAXNAMELEN + 1];
-
- return nis_domain_of_r (name, result, NIS_MAXNAMELEN);
-}
-
-nis_name
-nis_domain_of_r (const nis_name name, char *buffer, size_t buflen)
-{
- char *cptr;
- size_t cptr_len;
-
- cptr = strchr (name, '.'); /* XXX What happens if the NIS name
- does not contain a `.'? */
- ++cptr;
- cptr_len = strlen (cptr);
-
- if (cptr_len == 0)
- strcpy (buffer, ".");
- else if (cptr_len >= buflen)
- {
- errno = ERANGE;
- return NULL;
- }
- else
- memcpy (buffer, cptr, cptr_len + 1);
-
- return buffer;
-}
-
-static int
-count_dots (const nis_name str)
+static int __always_inline
+count_dots (const_nis_name str)
{
int count = 0;
- size_t i;
- for (i = 0; i < strlen (str); ++i)
+ for (size_t i = 0; str[i] != '\0'; ++i)
if (str[i] == '.')
++count;
return count;
}
+/* If we run out of memory, we don't give already allocated memory
+ free. The overhead for bringing getnames back in a safe state to
+ free it is to big. */
nis_name *
-nis_getnames (const nis_name name)
+nis_getnames (const_nis_name 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)
+ const char *local_domain = nis_local_directory ();
+ size_t local_domain_len = strlen (local_domain);
+ size_t name_len = strlen (name);
+ char *path;
+ int pos = 0;
+ char *saveptr = NULL;
+ int have_point;
+ const char *cp;
+ const char *cp2;
+
+ int count = 2;
+ nis_name *getnames = malloc ((count + 1) * sizeof (char *));
+ if (__builtin_expect (getnames == NULL, 0))
return NULL;
/* Do we have a fully qualified NIS+ name ? If yes, give it back */
- if (name[strlen (name) - 1] == '.')
+ if (name[name_len - 1] == '.')
{
if ((getnames[0] = strdup (name)) == NULL)
{
+ free_null:
+ while (pos-- > 0)
+ free (getnames[pos]);
free (getnames);
return NULL;
}
+
getnames[1] = NULL;
return getnames;
}
+ /* If the passed NAME is shared a suffix (the latter of course with
+ a final dot) with each other we pass back NAME with a final
+ dot. */
+ if (local_domain_len > 2)
+ {
+ have_point = 0;
+ cp = &local_domain[local_domain_len - 2];
+ cp2 = &name[name_len - 1];
+
+ while (*cp == *cp2)
+ {
+ if (*cp == '.')
+ have_point = 1;
+ --cp;
+ --cp2;
+ if (cp < local_domain)
+ {
+ have_point = cp2 < name || *cp2 == '.';
+ break;
+ }
+ if (cp2 < name)
+ {
+ have_point = *cp == '.';
+ break;
+ }
+ }
+
+ if (have_point)
+ {
+ getnames[0] = malloc (name_len + 2);
+ if (getnames[0] == NULL)
+ goto free_null;
+
+ strcpy (stpcpy (getnames[0], name), ".");
+ ++pos;
+ }
+ }
+
/* Get the search path, where we have to search "name" */
path = getenv ("NIS_PATH");
if (path == NULL)
else
path = strdupa (path);
- pos = 0;
+ have_point = strchr (name, '.') != NULL;
- cp = strtok (path, ":");
+ cp = __strtok_r (path, ":", &saveptr);
while (cp)
{
if (strcmp (cp, "$") == 0)
{
- char *cptr = local_domain;
+ const char *cptr = local_domain;
char *tmp;
- while (count_dots (cptr) >= 2)
+ while (*cptr != '\0' && count_dots (cptr) >= 2)
{
if (pos >= count)
{
count += 5;
- getnames = realloc (getnames, (count + 1) * sizeof (char *));
+ nis_name *newp = realloc (getnames,
+ (count + 1) * sizeof (char *));
+ if (__builtin_expect (newp == NULL, 0))
+ goto free_null;
+ getnames = newp;
}
- tmp = malloc (strlen (cptr) + strlen (local_domain) +
- strlen (name) + 2);
- if (tmp == NULL)
- return NULL;
+ tmp = malloc (strlen (cptr) + local_domain_len + name_len + 2);
+ if (__builtin_expect (tmp == NULL, 0))
+ goto free_null;
getnames[pos] = tmp;
tmp = stpcpy (tmp, name);
*tmp++ = '.';
- stpcpy (tmp, cptr);
+ if (cptr[1] != '\0')
+ stpcpy (tmp, cptr);
+ else
+ ++cptr;
++pos;
- while (*cptr != '.')
+ while (*cptr != '.' && *cptr != '\0')
+ ++cptr;
+ if (cptr[0] != '\0' && cptr[1] != '\0')
+ /* If we have only ".", don't remove the "." */
++cptr;
- ++cptr;
}
}
else
{
char *tmp;
+ size_t cplen = strlen (cp);
- if (cp[strlen (cp) - 1] == '$')
+ if (cp[cplen - 1] == '$')
{
- tmp = malloc (strlen (cp) + strlen (local_domain) +
- strlen (name) + 2);
- if (tmp == NULL)
- return NULL;
-
- tmp = stpcpy (tmp, name);
- *tmp++ = '.';
- tmp = stpcpy (tmp, cp);
- --tmp;
- if (tmp[-1] != '.')
- *tmp++ = '.';
- stpcpy (tmp, local_domain);
+ char *p;
+
+ tmp = malloc (cplen + local_domain_len + name_len + 2);
+ if (__builtin_expect (tmp == NULL, 0))
+ goto free_null;
+
+ p = __stpcpy (tmp, name);
+ *p++ = '.';
+ p = __mempcpy (p, cp, cplen);
+ --p;
+ if (p[-1] != '.')
+ *p++ = '.';
+ __stpcpy (p, local_domain);
}
else
{
- tmp = malloc (strlen (cp) + strlen (name) + 2);
- if (tmp == NULL)
- return NULL;
-
- tmp = stpcpy (tmp, name);
- *tmp++ = '.';
- stpcpy (tmp, cp);
+ char *p;
+
+ tmp = malloc (cplen + name_len + 3);
+ if (__builtin_expect (tmp == NULL, 0))
+ goto free_null;
+
+ p = __mempcpy (tmp, name, name_len);
+ *p++ = '.';
+ p = __mempcpy (p, cp, cplen);
+ if (p[-1] != '.')
+ *p++ = '.';
+ *p = '\0';
}
- if (pos > count)
+ if (pos >= count)
{
count += 5;
- getnames = realloc (getnames, (count + 1) * sizeof (char *));
- if (getnames == NULL)
- return NULL;
+ nis_name *newp = realloc (getnames,
+ (count + 1) * sizeof (char *));
+ if (__builtin_expect (newp == NULL, 0))
+ goto free_null;
+ getnames = newp;
}
getnames[pos] = tmp;
++pos;
}
- cp = strtok (NULL, ":");
+ cp = __strtok_r (NULL, ":", &saveptr);
}
+ if (pos == 0
+ && __asprintf (&getnames[pos++], "%s%s%s%s",
+ name, name[name_len - 1] == '.' ? "" : ".",
+ local_domain,
+ local_domain[local_domain_len - 1] == '.' ? "" : ".") < 0)
+ goto free_null;
+
getnames[pos] = NULL;
return getnames;
}
+libnsl_hidden_def (nis_getnames)
void
nis_freenames (nis_name *names)
free (names);
}
+libnsl_hidden_def (nis_freenames)
name_pos
-nis_dir_cmp (const nis_name n1, const nis_name n2)
+nis_dir_cmp (const_nis_name n1, const_nis_name n2)
{
int len1, len2;
}
}
+libnsl_hidden_def (nis_dir_cmp)
void
nis_destroy_object (nis_object *obj)
{
nis_free_object (obj);
}
+libnsl_hidden_def (nis_destroy_object)
projects / thirdparty / glibc.git / blobdiff