summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenis Vlasenko2006-12-30 21:11:57 +0000
committerDenis Vlasenko2006-12-30 21:11:57 +0000
commitcb04ff5c68c1363837d8cd9f2170bdf64625b872 (patch)
treeadde9e8d46920ae48f3768e6b7fa76bdd123f618 /include
parent80602a98bcc3100279e09e1291d47a0adb6addb1 (diff)
downloadbusybox-cb04ff5c68c1363837d8cd9f2170bdf64625b872.zip
busybox-cb04ff5c68c1363837d8cd9f2170bdf64625b872.tar.gz
fixdep.c: avoit doing memcmp in most cases
uidgid_get.c: add forgotten copyright notice pwd/grp/shadow: avoid collisions with libc names
Diffstat (limited to 'include')
-rw-r--r--include/grp_.h74
-rw-r--r--include/pwd_.h71
-rw-r--r--include/shadow_.h26
3 files changed, 114 insertions, 57 deletions
diff --git a/include/grp_.h b/include/grp_.h
index b34addf..061b86e 100644
--- a/include/grp_.h
+++ b/include/grp_.h
@@ -21,50 +21,71 @@
* POSIX Standard: 9.2.1 Group Database Access <grp.h>
*/
+#if !ENABLE_USE_BB_PWD_GRP
-#if !defined CONFIG_USE_BB_PWD_GRP
#include <grp.h>
#else
#ifndef _GRP_H
-#define _GRP_H 1
-
-#include <sys/types.h>
-#include <features.h>
-#include <stdio.h>
+#define _GRP_H 1
/* 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. */
+struct group {
+ char *gr_name; /* Group name. */
+ char *gr_passwd; /* Password. */
+ gid_t gr_gid; /* Group ID. */
+ char **gr_mem; /* Member list. */
};
+/* We don't reimplement this, just supplying prototype */
+/* The function itself is in libc */
+/* Set the group set for the current user to GROUPS (N of them). */
+extern int setgroups(size_t __n, __const gid_t *__groups);
+
+
+#define setgrent bb_internal_setgrent
+#define endgrent bb_internal_endgrent
+#define getgrent bb_internal_getgrent
+#define fgetgrent bb_internal_fgetgrent
+#define putgrent bb_internal_putgrent
+#define getgrgid bb_internal_getgrgid
+#define getgrnam bb_internal_getgrnam
+#define getgrent_r bb_internal_getgrent_r
+#define getgrgid_r bb_internal_getgrgid_r
+#define getgrnam_r bb_internal_getgrnam_r
+#define fgetgrent_r bb_internal_fgetgrent_r
+#define getgrouplist bb_internal_getgrouplist
+#define initgroups bb_internal_initgroups
+
+
+/* All function names below should be remapped by #defines above
+ * in order to not collide with libc names.
+ * In theory it isn't necessary, but I saw weird interactions at link time.
+ * Let's play safe */
+
/* Rewind the group-file stream. */
-extern void setgrent (void);
+extern void setgrent(void);
/* Close the group-file stream. */
-extern void endgrent (void);
+extern void endgrent(void);
/* Read an entry from the group-file stream, opening it if necessary. */
-extern struct group *getgrent (void);
+extern struct group *getgrent(void);
/* Read a group entry from STREAM. */
-extern struct group *fgetgrent (FILE *__stream);
+extern struct group *fgetgrent(FILE *__stream);
/* Write the given entry onto the given stream. */
-extern int putgrent (__const struct group *__restrict __p,
+extern int putgrent(__const struct group *__restrict __p,
FILE *__restrict __f);
/* Search for an entry with a matching group ID. */
-extern struct group *getgrgid (gid_t __gid);
+extern struct group *getgrgid(gid_t __gid);
/* Search for an entry with a matching group name. */
-extern struct group *getgrnam (__const char *__name);
+extern struct group *getgrnam(__const char *__name);
/* Reentrant versions of some of the functions above.
@@ -74,41 +95,38 @@ extern struct group *getgrnam (__const char *__name);
other reentrant functions so the chances are good this is what the
POSIX people would choose. */
-extern int getgrent_r (struct group *__restrict __resultbuf,
+extern int getgrent_r(struct group *__restrict __resultbuf,
char *__restrict __buffer, size_t __buflen,
struct group **__restrict __result);
/* Search for an entry with a matching group ID. */
-extern int getgrgid_r (gid_t __gid, struct group *__restrict __resultbuf,
+extern int getgrgid_r(gid_t __gid, struct group *__restrict __resultbuf,
char *__restrict __buffer, size_t __buflen,
struct group **__restrict __result);
/* Search for an entry with a matching group name. */
-extern int getgrnam_r (__const char *__restrict __name,
+extern int getgrnam_r(__const char *__restrict __name,
struct group *__restrict __resultbuf,
char *__restrict __buffer, size_t __buflen,
struct group **__restrict __result);
/* Read a group entry from STREAM. This function is not standardized
an probably never will. */
-extern int fgetgrent_r (FILE *__restrict __stream,
+extern int fgetgrent_r(FILE *__restrict __stream,
struct group *__restrict __resultbuf,
char *__restrict __buffer, size_t __buflen,
struct group **__restrict __result);
-/* Set the group set for the current user to GROUPS (N of them). */
-extern int setgroups (size_t __n, __const gid_t *__groups);
-
/* Store at most *NGROUPS members of the group set for USER into
*GROUPS. Also include GROUP. The actual number of groups found is
returned in *NGROUPS. Return -1 if the if *NGROUPS is too small. */
-extern int getgrouplist (__const char *__user, gid_t __group,
+extern int getgrouplist(__const char *__user, gid_t __group,
gid_t *__groups, int *__ngroups);
/* Initialize the group set for the current user
by reading the group database and using all groups
of which USER is a member. Also include GROUP. */
-extern int initgroups (__const char *__user, gid_t __group);
+extern int initgroups(__const char *__user, gid_t __group);
#endif /* grp.h */
diff --git a/include/pwd_.h b/include/pwd_.h
index d161c0e..f47e4eb 100644
--- a/include/pwd_.h
+++ b/include/pwd_.h
@@ -21,52 +21,68 @@
* POSIX Standard: 9.2.2 User Database Access <pwd.h>
*/
-#if !defined CONFIG_USE_BB_PWD_GRP
+#if !ENABLE_USE_BB_PWD_GRP
+
#include <pwd.h>
#else
#ifndef _PWD_H
-#define _PWD_H 1
-
-#include <sys/types.h>
-#include <features.h>
-#include <stdio.h>
+#define _PWD_H 1
/* 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. */
+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. */
};
+#define setpwent bb_internal_setpwent
+#define endpwent bb_internal_endpwent
+#define getpwent bb_internal_getpwent
+#define fgetpwent bb_internal_fgetpwent
+#define putpwent bb_internal_putpwent
+#define getpwuid bb_internal_getpwuid
+#define getpwnam bb_internal_getpwnam
+#define getpwent_r bb_internal_getpwent_r
+#define getpwuid_r bb_internal_getpwuid_r
+#define getpwnam_r bb_internal_getpwnam_r
+#define fgetpwent_r bb_internal_fgetpwent_r
+#define getpw bb_internal_getpw
+
+
+/* All function names below should be remapped by #defines above
+ * in order to not collide with libc names.
+ * In theory it isn't necessary, but I saw weird interactions at link time.
+ * Let's play safe */
+
+
/* Rewind the password-file stream. */
-extern void setpwent (void);
+extern void setpwent(void);
/* Close the password-file stream. */
-extern void endpwent (void);
+extern void endpwent(void);
/* Read an entry from the password-file stream, opening it if necessary. */
-extern struct passwd *getpwent (void);
+extern struct passwd *getpwent(void);
/* Read an entry from STREAM. */
-extern struct passwd *fgetpwent (FILE *__stream);
+extern struct passwd *fgetpwent(FILE *__stream);
/* Write the given entry onto the given stream. */
-extern int putpwent (__const struct passwd *__restrict __p,
+extern int putpwent(__const struct passwd *__restrict __p,
FILE *__restrict __f);
/* Search for an entry with a matching user ID. */
-extern struct passwd *getpwuid (uid_t __uid);
+extern struct passwd *getpwuid(uid_t __uid);
/* Search for an entry with a matching username. */
-extern struct passwd *getpwnam (__const char *__name);
+extern struct passwd *getpwnam(__const char *__name);
/* Reentrant versions of some of the functions above.
@@ -76,24 +92,23 @@ extern struct passwd *getpwnam (__const char *__name);
other reentrant functions so the chances are good this is what the
POSIX people would choose. */
-extern int getpwent_r (struct passwd *__restrict __resultbuf,
+extern int getpwent_r(struct passwd *__restrict __resultbuf,
char *__restrict __buffer, size_t __buflen,
struct passwd **__restrict __result);
-extern int getpwuid_r (uid_t __uid,
+extern int getpwuid_r(uid_t __uid,
struct passwd *__restrict __resultbuf,
char *__restrict __buffer, size_t __buflen,
struct passwd **__restrict __result);
-extern int getpwnam_r (__const char *__restrict __name,
+extern int getpwnam_r(__const char *__restrict __name,
struct passwd *__restrict __resultbuf,
char *__restrict __buffer, size_t __buflen,
struct passwd **__restrict __result);
-
/* Read an entry from STREAM. This function is not standardized and
probably never will. */
-extern int fgetpwent_r (FILE *__restrict __stream,
+extern int fgetpwent_r(FILE *__restrict __stream,
struct passwd *__restrict __resultbuf,
char *__restrict __buffer, size_t __buflen,
struct passwd **__restrict __result);
@@ -101,7 +116,7 @@ extern int fgetpwent_r (FILE *__restrict __stream,
/* Re-construct the password-file line for the given uid
in the given buffer. This knows the format that the caller
will expect, but this need not be the format of the password file. */
-extern int getpw (uid_t __uid, char *__buffer);
+extern int getpw(uid_t __uid, char *__buffer);
#endif /* pwd.h */
#endif
diff --git a/include/shadow_.h b/include/shadow_.h
index 634dfb4..fb2153c 100644
--- a/include/shadow_.h
+++ b/include/shadow_.h
@@ -20,11 +20,13 @@
/* Declaration of types and functions for shadow password suite */
#if !ENABLE_USE_BB_SHADOW
+
#include <shadow.h>
+
#else
#ifndef _SHADOW_H
-#define _SHADOW_H 1
+#define _SHADOW_H 1
/* Paths to the user database files */
#ifndef _PATH_SHADOW
@@ -44,6 +46,28 @@ struct spwd {
unsigned long int sp_flag; /* Reserved */
};
+
+#define setspent bb_internal_setspent
+#define endspent bb_internal_endspent
+#define getspent bb_internal_getspent
+#define getspnam bb_internal_getspnam
+#define sgetspent bb_internal_sgetspent
+#define fgetspent bb_internal_fgetspent
+#define putspent bb_internal_putspent
+#define getspent_r bb_internal_getspent_r
+#define getspnam_r bb_internal_getspnam_r
+#define sgetspent_r bb_internal_sgetspent_r
+#define fgetspent_r bb_internal_fgetspent_r
+#define lckpwdf bb_internal_lckpwdf
+#define ulckpwdf bb_internal_ulckpwdf
+
+
+/* All function names below should be remapped by #defines above
+ * in order to not collide with libc names.
+ * In theory it isn't necessary, but I saw weird interactions at link time.
+ * Let's play safe */
+
+
/* Open database for reading */
extern void setspent(void);