f796700cf
Russ Dill
2003-12-18
Subject
rename __getgrent so that it doesn't conflict with some libc's
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/grp_.h +1 -1libpwdgrp/__getgrent.c +1 -1libpwdgrp/fgetgrent.c +1 -1libpwdgrp/getgrgid.c +1 -1libpwdgrp/getgrnam.c +1 -1libpwdgrp/grent.c +1 -1libpwdgrp/initgroups.c +2 -2
include/grp_.h+1 -1
| @@ -32,7 +32,7 @@ extern struct group * fgetgrent __P ((FILE * file)); | |
| extern int setgroups __P ((size_t n, __const gid_t * groups)); | |
| extern int initgroups __P ((__const char * user, gid_t gid)); | |
| - | extern struct group * __getgrent __P ((int grp_fd)); |
| + | extern struct group * bb_getgrent __P ((int grp_fd)); |
| #endif /* USE_SYSTEM_PWD_GRP */ | |
| #endif /* __CONFIG_GRP_H */ | |
libpwdgrp/__getgrent.c+1 -1
| @@ -71,7 +71,7 @@ | |
| * getgrent() except that it is passed a file descriptor. getgrent() | |
| * is just a wrapper for this function. | |
| */ | |
| - | struct group *__getgrent(int grp_fd) |
| + | struct group *bb_getgrent(int grp_fd) |
| { | |
| #ifndef GR_SCALE_DYNAMIC | |
| static char line_buff[GR_MAX_LINE_LEN]; | |
libpwdgrp/fgetgrent.c+1 -1
| @@ -31,5 +31,5 @@ struct group *fgetgrent(FILE * file) | |
| return NULL; | |
| } | |
| - | return __getgrent(fileno(file)); |
| + | return bb_getgrent(fileno(file)); |
| } | |
libpwdgrp/getgrgid.c+1 -1
| @@ -33,7 +33,7 @@ struct group *getgrgid(const gid_t gid) | |
| if ((grp_fd = open(bb_path_group_file, O_RDONLY)) < 0) | |
| return NULL; | |
| - | while ((group = __getgrent(grp_fd)) != NULL) |
| + | while ((group = bb_getgrent(grp_fd)) != NULL) |
| if (group->gr_gid == gid) { | |
| close(grp_fd); | |
| return group; | |
libpwdgrp/getgrnam.c+1 -1
| @@ -39,7 +39,7 @@ struct group *getgrnam(const char *name) | |
| if ((grp_fd = open(bb_path_group_file, O_RDONLY)) < 0) | |
| return NULL; | |
| - | while ((group = __getgrent(grp_fd)) != NULL) |
| + | while ((group = bb_getgrent(grp_fd)) != NULL) |
| if (!strcmp(group->gr_name, name)) { | |
| close(grp_fd); | |
| return group; | |
libpwdgrp/grent.c+1 -1
| @@ -50,5 +50,5 @@ struct group *getgrent(void) | |
| { | |
| if (grp_fd == -1) | |
| return NULL; | |
| - | return __getgrent(grp_fd); |
| + | return bb_getgrent(grp_fd); |
| } | |
libpwdgrp/initgroups.c+2 -2
| @@ -89,9 +89,9 @@ int initgroups(__const char *user, gid_t gid) | |
| group_list[num_groups] = gid; | |
| #ifndef GR_DYNAMIC_GROUP_LIST | |
| while (num_groups < GR_MAX_GROUPS && | |
| - | (group = __getgrent(grp_fd)) != NULL) |
| + | (group = bb_getgrent(grp_fd)) != NULL) |
| #else | |
| - | while ((group = __getgrent(grp_fd)) != NULL) |
| + | while ((group = bb_getgrent(grp_fd)) != NULL) |
| #endif | |
| { | |
| if (group->gr_gid != gid) | |