AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 11:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

* nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_parse_rpcent):

Browse Source 
Significant cleanups.  Correct adjustment for pointer array.
	Likewise.
This commit is contained in:
Ulrich Drepper 2006-04-15 17:52:52 +00:00
parent 004c621963
commit 0944b9e1f0
3 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,8 +1,10 @@
2006-04-15 Ulrich Drepper <drepper@redhat.com> 2006-04-15 Ulrich Drepper <drepper@redhat.com>
* nis/nss_nisplus/nisplus-publickey.c: Minor cleanups throughout. * nis/nss_nisplus/nisplus-publickey.c: Minor cleanups throughout.
* nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_parse_rpcent):
Significant cleanups. Correct adjustment for pointer array.
* nis/nss_nisplus/nisplus-proto.c (_nss_nisplus_parse_protoent): * nis/nss_nisplus/nisplus-proto.c (_nss_nisplus_parse_protoent):
Significant cleanups. Correct adjustment for pointer array Likewise.
* nis/nss_nisplus/nisplus-network.c (_nss_nisplus_parse_netent): * nis/nss_nisplus/nisplus-network.c (_nss_nisplus_parse_netent):
Likewise. Likewise.
* nis/nss_nisplus/nisplus-hosts.c (_nss_nisplus_parse_hostent): * nis/nss_nisplus/nisplus-hosts.c (_nss_nisplus_parse_hostent):

5
nis/nss_nisplus/nisplus-proto.c
View File

@ -78,8 +78,11 @@ _nss_nisplus_parse_protoent (nis_result *result, struct protoent *proto,
proto->p_proto = atoi (NISENTRYVAL (0, 2, result)); proto->p_proto = atoi (NISENTRYVAL (0, 2, result));
/* XXX Rewrite at some point to allocate the array first and then
copy the strings. It wasteful to first concatenate the strings
to just split them again later. */
char *line = first_unused; char *line = first_unused;
for (i = 0; i < result->objects.objects_len; ++i) for (i = 0; i < NIS_RES_NUMOBJ (result); ++i)
{ {
if (strcmp (NISENTRYVAL (i, 1, result), proto->p_name) != 0) if (strcmp (NISENTRYVAL (i, 1, result), proto->p_name) != 0)
{ {

70
nis/nss_nisplus/nisplus-rpc.c
View File

@ -35,11 +35,12 @@ static nis_result *result;
static nis_name tablename_val; static nis_name tablename_val;
static u_long tablename_len; static u_long tablename_len;
#define NISENTRYVAL(idx,col,res) \ #define NISENTRYVAL(idx, col, res) \
((res)->objects.objects_val[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_val) (NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val)
#define NISENTRYLEN(idx, col, res) \
(NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len)
#define NISENTRYLEN(idx,col,res) \
((res)->objects.objects_val[(idx)].EN_data.en_cols.en_cols_val[(col)].ec_value.ec_value_len)
static int static int
_nss_nisplus_parse_rpcent (nis_result *result, struct rpcent *rpc, _nss_nisplus_parse_rpcent (nis_result *result, struct rpcent *rpc,
@ -48,17 +49,16 @@ _nss_nisplus_parse_rpcent (nis_result *result, struct rpcent *rpc,
char *first_unused = buffer; char *first_unused = buffer;
size_t room_left = buflen; size_t room_left = buflen;
unsigned int i; unsigned int i;
char *p, *line; char *line;
if (result == NULL) if (result == NULL)
return 0; return 0;
if ((result->status != NIS_SUCCESS && result->status != NIS_S_SUCCESS) if ((result->status != NIS_SUCCESS && result->status != NIS_S_SUCCESS)
|| __type_of (result->objects.objects_val) != NIS_ENTRY_OBJ || __type_of (NIS_RES_OBJECT (result)) != NIS_ENTRY_OBJ
|| strcmp (result->objects.objects_val[0].EN_data.en_type, || strcmp (NIS_RES_OBJECT (result)[0].EN_data.en_type, "rpc_tbl") != 0
"rpc_tbl") != 0 || NIS_RES_OBJECT (result)[0].EN_data.en_cols.en_cols_len < 3)
|| result->objects.objects_val[0].EN_data.en_cols.en_cols_len < 3)
return 0; return 0;
if (NISENTRYLEN (0, 0, result) >= room_left) if (NISENTRYLEN (0, 0, result) >= room_left)
@ -71,37 +71,43 @@ _nss_nisplus_parse_rpcent (nis_result *result, struct rpcent *rpc,
NISENTRYLEN (0, 0, result)); NISENTRYLEN (0, 0, result));
first_unused[NISENTRYLEN (0, 0, result)] = '\0'; first_unused[NISENTRYLEN (0, 0, result)] = '\0';
rpc->r_name = first_unused; rpc->r_name = first_unused;
room_left -= (strlen (first_unused) + 1); size_t len = strlen (first_unused) + 1;
first_unused += strlen (first_unused) + 1; room_left -= len;
rpc->r_number = atoi (NISENTRYVAL (0, 2, result)); first_unused += len;
p = first_unused;
line = p; rpc->r_number = atoi (NISENTRYVAL (0, 2, result));
for (i = 0; i < result->objects.objects_len; ++i)
/* XXX Rewrite at some point to allocate the array first and then
copy the strings. It wasteful to first concatenate the strings
to just split them again later. */
line = first_unused;
for (i = 0; i < NIS_RES_NUMOBJ (result); ++i)
{ {
if (strcmp (NISENTRYVAL (i, 1, result), rpc->r_name) != 0) if (strcmp (NISENTRYVAL (i, 1, result), rpc->r_name) != 0)
{ {
if (NISENTRYLEN (i, 1, result) + 2 > room_left) if (NISENTRYLEN (i, 1, result) + 2 > room_left)
goto no_more_room; goto no_more_room;
*p++ = ' '; *first_unused++ = ' ';
p = __stpncpy (p, NISENTRYVAL (i, 1, result), first_unused = __stpncpy (first_unused, NISENTRYVAL (i, 1, result),
NISENTRYLEN (i, 1, result)); NISENTRYLEN (i, 1, result));
*p = '\0'; room_left -= NISENTRYLEN (i, 1, result) + 1;
room_left -= (NISENTRYLEN (i, 1, result) + 1);
} }
} }
++p; *first_unused++ = '\0';
first_unused = p;
/* Adjust the pointer so it is aligned for /* Adjust the pointer so it is aligned for
storing pointers. */ storing pointers. */
first_unused += __alignof__ (char *) - 1; size_t adjust = ((__alignof__ (char *)
first_unused -= ((first_unused - (char *) 0) % __alignof__ (char *)); - (first_unused - (char *) 0) % __alignof__ (char *))
rpc->r_aliases = (char **) first_unused; % __alignof__ (char *));
if (room_left < sizeof (char *)) if (room_left < adjust + sizeof (char *))
goto no_more_room; goto no_more_room;
first_unused += adjust;
room_left -= adjust;
rpc->r_aliases = (char **) first_unused;
/* For the terminating NULL pointer. */
room_left -= sizeof (char *); room_left -= sizeof (char *);
rpc->r_aliases[0] = NULL;
i = 0; i = 0;
while (*line != '\0') while (*line != '\0')
@ -117,24 +123,20 @@ _nss_nisplus_parse_rpcent (nis_result *result, struct rpcent *rpc,
goto no_more_room; goto no_more_room;
room_left -= sizeof (char *); room_left -= sizeof (char *);
rpc->r_aliases[i] = line; rpc->r_aliases[i++] = line;
while (*line != '\0' && *line != ' ') while (*line != '\0' && *line != ' ')
++line; ++line;
if (*line == ' ') if (*line == ' ')
{ *line++ = '\0';
*line = '\0';
++line;
++i;
}
else
rpc->r_aliases[i+1] = NULL;
} }
rpc->r_aliases[i] = NULL;
return 1; return 1;
} }
static enum nss_status static enum nss_status
_nss_create_tablename (int *errnop) _nss_create_tablename (int *errnop)
{ {