diff options
| author | Russ Dill <Russ.Dill@asu.edu> | 2003-12-18 22:40:58 +0000 |
|---|---|---|
| committer | Russ Dill <Russ.Dill@asu.edu> | 2003-12-18 22:40:58 +0000 |
| commit | f796700cf010d7ff2615c59bc364bbbef14153a4 (patch) | |
| tree | 59da8113d1decbb3ae5731d06487e56c426afb0f /libpwdgrp | |
| parent | 4e864a36b611f56c6b347be1dace4e5e805a3eb8 (diff) | |
| download | busybox-f796700cf010d7ff2615c59bc364bbbef14153a4.tar.gz | |
rename __getgrent so that it doesn't conflict with some libc's
Diffstat (limited to 'libpwdgrp')
| -rw-r--r-- | libpwdgrp/__getgrent.c | 2 | ||||
| -rw-r--r-- | libpwdgrp/fgetgrent.c | 2 | ||||
| -rw-r--r-- | libpwdgrp/getgrgid.c | 2 | ||||
| -rw-r--r-- | libpwdgrp/getgrnam.c | 2 | ||||
| -rw-r--r-- | libpwdgrp/grent.c | 2 | ||||
| -rw-r--r-- | libpwdgrp/initgroups.c | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/libpwdgrp/__getgrent.c b/libpwdgrp/__getgrent.c index 392301048..a20b3a260 100644 --- a/libpwdgrp/__getgrent.c +++ b/libpwdgrp/__getgrent.c @@ -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]; diff --git a/libpwdgrp/fgetgrent.c b/libpwdgrp/fgetgrent.c index 1492a1a95..da4ca053f 100644 --- a/libpwdgrp/fgetgrent.c +++ b/libpwdgrp/fgetgrent.c @@ -31,5 +31,5 @@ struct group *fgetgrent(FILE * file) return NULL; } - return __getgrent(fileno(file)); + return bb_getgrent(fileno(file)); } diff --git a/libpwdgrp/getgrgid.c b/libpwdgrp/getgrgid.c index 7ffe8c5c3..0f5ce1cac 100644 --- a/libpwdgrp/getgrgid.c +++ b/libpwdgrp/getgrgid.c @@ -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; diff --git a/libpwdgrp/getgrnam.c b/libpwdgrp/getgrnam.c index bf7f7646d..46950e2b6 100644 --- a/libpwdgrp/getgrnam.c +++ b/libpwdgrp/getgrnam.c @@ -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; diff --git a/libpwdgrp/grent.c b/libpwdgrp/grent.c index 609ed1a46..ff3c49e68 100644 --- a/libpwdgrp/grent.c +++ b/libpwdgrp/grent.c @@ -50,5 +50,5 @@ struct group *getgrent(void) { if (grp_fd == -1) return NULL; - return __getgrent(grp_fd); + return bb_getgrent(grp_fd); } diff --git a/libpwdgrp/initgroups.c b/libpwdgrp/initgroups.c index ce63adb18..f97948379 100644 --- a/libpwdgrp/initgroups.c +++ b/libpwdgrp/initgroups.c @@ -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) |