Fix header file usage -- there were many unnecessary header files included in
busybox.h which slowed compiles. I left only what was needed and then fixed up all the apps to include their own header files. I also fixed naming for pwd.h and grp.h functions. Tested to compile and run with libc5, glibc, and uClibc. -Erik
This commit is contained in:
@@ -5,17 +5,6 @@
|
||||
#include <pwd.h>
|
||||
#else
|
||||
|
||||
#define bb_setpwent setpwent
|
||||
#define bb_endpwent endpwent
|
||||
#define bb_getpwent getpwent
|
||||
#define bb_putpwent putpwent
|
||||
#define bb_getpw getpw
|
||||
#define bb_fgetpwent fgetpwent
|
||||
#define bb_getpwuid getpwuid
|
||||
#define bb_getpwnam getpwnam
|
||||
#define __bb_getpwent __bb_getpwent
|
||||
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <features.h>
|
||||
#include <stdio.h>
|
||||
@@ -32,19 +21,19 @@ struct passwd
|
||||
char *pw_shell; /* Shell program. */
|
||||
};
|
||||
|
||||
extern void bb_setpwent __P ((void));
|
||||
extern void bb_endpwent __P ((void));
|
||||
extern struct passwd * bb_getpwent __P ((void));
|
||||
extern void setpwent __P ((void));
|
||||
extern void endpwent __P ((void));
|
||||
extern struct passwd * getpwent __P ((void));
|
||||
|
||||
extern int bb_putpwent __P ((__const struct passwd * __p, FILE * __f));
|
||||
extern int bb_getpw __P ((uid_t uid, char *buf));
|
||||
extern int putpwent __P ((__const struct passwd * __p, FILE * __f));
|
||||
extern int getpw __P ((uid_t uid, char *buf));
|
||||
|
||||
extern struct passwd * bb_fgetpwent __P ((FILE * file));
|
||||
extern struct passwd * fgetpwent __P ((FILE * file));
|
||||
|
||||
extern struct passwd * bb_getpwuid __P ((__const uid_t));
|
||||
extern struct passwd * bb_getpwnam __P ((__const char *));
|
||||
extern struct passwd * getpwuid __P ((__const uid_t));
|
||||
extern struct passwd * getpwnam __P ((__const char *));
|
||||
|
||||
extern struct passwd * __bb_getpwent __P ((__const int passwd_fd));
|
||||
extern struct passwd * __getpwent __P ((__const int passwd_fd));
|
||||
|
||||
#endif /* USE_SYSTEM_PWD_GRP */
|
||||
#endif /* __BB_PWD_H */
|
||||
|
||||
Reference in New Issue
Block a user