mirror of
git://sourceware.org/git/glibc.git
synced 2025-02-05 12:40:55 +08:00
00e3dec802
code, make sure the nis_freeresult call doesn't crash and that the result is reported correctly. * nis/nis_table.c (nis_list): Handle FOLLOW_PATH | ALL_RESULTS when callback is NULL. * nis/Versions (libnss_nisplus): Add _nss_nisplus_initgroups_dyn@@GLIBC_PRIVATE. * nis/Makefile (libnss_nisplus-routines): Add nisplus-initgroups. * nis/nss_nisplus/nisplus-grp.c (tablename_val, tablename_len, _nss_create_tablename): Rename to... (grp_tablename_val, grp_tablename_len, _nss_grp_create_tablename): ... these. No longer static. (internal_setgrent): Adjust users. (_nss_nisplus_getgrnam_r, _nss_nisplus_getgrgid_r): Likewise. Don't use locking around _nss_grp_create_tablename call. * nis/nss_nisplus/nisplus-initgroups.c: New file.
82 lines
1.2 KiB
C
82 lines
1.2 KiB
C
#ifndef lint
|
|
#ifndef NOID
|
|
static char elsieid[] = "@(#)ialloc.c 8.29";
|
|
#endif /* !defined NOID */
|
|
#endif /* !defined lint */
|
|
|
|
/*LINTLIBRARY*/
|
|
|
|
#include "private.h"
|
|
|
|
#define nonzero(n) (((n) == 0) ? 1 : (n))
|
|
|
|
char *
|
|
imalloc(n)
|
|
const int n;
|
|
{
|
|
return malloc((size_t) nonzero(n));
|
|
}
|
|
|
|
char *
|
|
icalloc(nelem, elsize)
|
|
int nelem;
|
|
int elsize;
|
|
{
|
|
if (nelem == 0 || elsize == 0)
|
|
nelem = elsize = 1;
|
|
return calloc((size_t) nelem, (size_t) elsize);
|
|
}
|
|
|
|
void *
|
|
irealloc(pointer, size)
|
|
void * const pointer;
|
|
const int size;
|
|
{
|
|
if (pointer == NULL)
|
|
return imalloc(size);
|
|
return realloc((void *) pointer, (size_t) nonzero(size));
|
|
}
|
|
|
|
char *
|
|
icatalloc(old, new)
|
|
char * const old;
|
|
const char * const new;
|
|
{
|
|
register char * result;
|
|
register int oldsize, newsize;
|
|
|
|
newsize = (new == NULL) ? 0 : strlen(new);
|
|
if (old == NULL)
|
|
oldsize = 0;
|
|
else if (newsize == 0)
|
|
return old;
|
|
else oldsize = strlen(old);
|
|
if ((result = irealloc(old, oldsize + newsize + 1)) != NULL)
|
|
if (new != NULL)
|
|
(void) strcpy(result + oldsize, new);
|
|
return result;
|
|
}
|
|
|
|
char *
|
|
icpyalloc(string)
|
|
const char * const string;
|
|
{
|
|
return icatalloc((char *) NULL, string);
|
|
}
|
|
|
|
void
|
|
ifree(p)
|
|
char * const p;
|
|
{
|
|
if (p != NULL)
|
|
(void) free(p);
|
|
}
|
|
|
|
void
|
|
icfree(p)
|
|
char * const p;
|
|
{
|
|
if (p != NULL)
|
|
(void) free(p);
|
|
}
|