From 887ca79f04cdf45874ed783c1fb9b950bf25a246 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 3 Jul 2002 23:19:26 +0000 Subject: Scrub pwd.h and grp.h handling so we don't have to play any silly games. -Erik --- include/grp.h | 39 --------------------------------------- include/grp_.h | 39 +++++++++++++++++++++++++++++++++++++++ include/libbb.h | 4 ++-- include/pwd.h | 41 ----------------------------------------- include/pwd_.h | 41 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 82 deletions(-) delete mode 100644 include/grp.h create mode 100644 include/grp_.h delete mode 100644 include/pwd.h create mode 100644 include/pwd_.h (limited to 'include') diff --git a/include/grp.h b/include/grp.h deleted file mode 100644 index 12fecd02e..000000000 --- a/include/grp.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef __CONFIG_GRP_H -#define __CONFIG_GRP_H - -#if !defined CONFIG_USE_BB_PWD_GRP -#include_next - -#else - -#include -#include -#include - - -/* The group structure */ -struct group -{ - char *gr_name; /* Group name. */ - char *gr_passwd; /* Password. */ - gid_t gr_gid; /* Group ID. */ - char **gr_mem; /* Member list. */ -}; - -extern void setgrent __P ((void)); -extern void endgrent __P ((void)); -extern struct group * getgrent __P ((void)); - -extern struct group * getgrgid __P ((__const gid_t gid)); -extern struct group * getgrnam __P ((__const char * name)); - -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)); - -#endif /* USE_SYSTEM_PWD_GRP */ -#endif /* __CONFIG_GRP_H */ - diff --git a/include/grp_.h b/include/grp_.h new file mode 100644 index 000000000..0ce274cf0 --- /dev/null +++ b/include/grp_.h @@ -0,0 +1,39 @@ +#ifndef __CONFIG_GRP_H +#define __CONFIG_GRP_H + +#if !defined CONFIG_USE_BB_PWD_GRP +#include + +#else + +#include +#include +#include + + +/* The group structure */ +struct group +{ + char *gr_name; /* Group name. */ + char *gr_passwd; /* Password. */ + gid_t gr_gid; /* Group ID. */ + char **gr_mem; /* Member list. */ +}; + +extern void setgrent __P ((void)); +extern void endgrent __P ((void)); +extern struct group * getgrent __P ((void)); + +extern struct group * getgrgid __P ((__const gid_t gid)); +extern struct group * getgrnam __P ((__const char * name)); + +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)); + +#endif /* USE_SYSTEM_PWD_GRP */ +#endif /* __CONFIG_GRP_H */ + diff --git a/include/libbb.h b/include/libbb.h index f83cc7623..02babb884 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -39,8 +39,8 @@ #include "config.h" -#include "pwd.h" -#include "grp.h" +#include "pwd_.h" +#include "grp_.h" #ifdef CONFIG_FEATURE_SHADOWPASSWDS #include "shadow_.h" #endif diff --git a/include/pwd.h b/include/pwd.h deleted file mode 100644 index 178e9e97a..000000000 --- a/include/pwd.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef __CONFIG_PWD_H -#define __CONFIG_PWD_H - -#if !defined CONFIG_USE_BB_PWD_GRP -#include_next - -#else - -#include -#include -#include - -/* The passwd structure. */ -struct passwd -{ - char *pw_name; /* Username. */ - char *pw_passwd; /* Password. */ - uid_t pw_uid; /* User ID. */ - gid_t pw_gid; /* Group ID. */ - char *pw_gecos; /* Real name. */ - char *pw_dir; /* Home directory. */ - char *pw_shell; /* Shell program. */ -}; - -extern void setpwent __P ((void)); -extern void endpwent __P ((void)); -extern struct passwd * getpwent __P ((void)); - -extern int putpwent __P ((__const struct passwd * __p, FILE * __f)); -extern int getpw __P ((uid_t uid, char *buf)); - -extern struct passwd * fgetpwent __P ((FILE * file)); - -extern struct passwd * getpwuid __P ((__const uid_t)); -extern struct passwd * getpwnam __P ((__const char *)); - -extern struct passwd * __getpwent __P ((__const int passwd_fd)); - -#endif /* USE_SYSTEM_PWD_GRP */ -#endif /* __CONFIG_PWD_H */ - diff --git a/include/pwd_.h b/include/pwd_.h new file mode 100644 index 000000000..3f081e872 --- /dev/null +++ b/include/pwd_.h @@ -0,0 +1,41 @@ +#ifndef __CONFIG_PWD_H +#define __CONFIG_PWD_H + +#if !defined CONFIG_USE_BB_PWD_GRP +#include + +#else + +#include +#include +#include + +/* The passwd structure. */ +struct passwd +{ + char *pw_name; /* Username. */ + char *pw_passwd; /* Password. */ + uid_t pw_uid; /* User ID. */ + gid_t pw_gid; /* Group ID. */ + char *pw_gecos; /* Real name. */ + char *pw_dir; /* Home directory. */ + char *pw_shell; /* Shell program. */ +}; + +extern void setpwent __P ((void)); +extern void endpwent __P ((void)); +extern struct passwd * getpwent __P ((void)); + +extern int putpwent __P ((__const struct passwd * __p, FILE * __f)); +extern int getpw __P ((uid_t uid, char *buf)); + +extern struct passwd * fgetpwent __P ((FILE * file)); + +extern struct passwd * getpwuid __P ((__const uid_t)); +extern struct passwd * getpwnam __P ((__const char *)); + +extern struct passwd * __getpwent __P ((__const int passwd_fd)); + +#endif /* USE_SYSTEM_PWD_GRP */ +#endif /* __CONFIG_PWD_H */ + -- cgit v1.2.3