X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fshadow_.h;h=98bd45d044f451927110ae35b06f8177a85dc77d;hb=db67a20595be279e7db9f5f8e27bd94534efb8d4;hp=1b14f0a7bc61c9e3bcad99cc90efa3da45b4cda3;hpb=9615a08218caa63c4221a6b5922c628328e719d1;p=oweals%2Fbusybox.git

diff --git a/include/shadow_.h b/include/shadow_.h
index 1b14f0a7b..98bd45d04 100644
--- a/include/shadow_.h
+++ b/include/shadow_.h
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -16,83 +17,92 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-/* Declaration of types and functions for shadow password suite.  */
+/* Declaration of types and functions for shadow password suite */
 
-#if !defined CONFIG_USE_BB_SHADOW
-#include <shadow.h>
-#else
+#ifndef BB_SHADOW_H
+#define BB_SHADOW_H 1
 
-#ifndef _SHADOW_H
-#define _SHADOW_H	1
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-#include <stdio.h>
+/* Structure of the password file */
+struct spwd {
+	char *sp_namp;          /* Login name */
+	char *sp_pwdp;          /* Encrypted password */
+	long sp_lstchg;         /* Date of last change */
+	long sp_min;            /* Minimum number of days between changes */
+	long sp_max;            /* Maximum number of days between changes */
+	long sp_warn;           /* Number of days to warn user to change the password */
+	long sp_inact;          /* Number of days the account may be inactive */
+	long sp_expire;         /* Number of days since 1970-01-01 until account expires */
+	unsigned long sp_flag;  /* Reserved */
+};
 
-/* Paths to the user database files.  */
+/* Paths to the user database files */
 #ifndef _PATH_SHADOW
-#define	_PATH_SHADOW	"/etc/shadow"
+#define _PATH_SHADOW "/etc/shadow"
 #endif
-#define	SHADOW _PATH_SHADOW
-
-
-/* Structure of the password file.  */
-struct spwd
-{
-    char *sp_namp;		/* Login name.  */
-    char *sp_pwdp;		/* Encrypted password.  */
-    long int sp_lstchg;		/* Date of last change.  */
-    long int sp_min;		/* Minimum number of days between changes.  */
-    long int sp_max;		/* Maximum number of days between changes.  */
-    long int sp_warn;		/* Number of days to warn user to change
-				   the password.  */
-    long int sp_inact;		/* Number of days the account may be
-				   inactive.  */
-    long int sp_expire;		/* Number of days since 1970-01-01 until
-				   account expires.  */
-    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. */
 
-/* Open database for reading.  */
-extern void setspent (void);
 
-/* Close database.  */
-extern void endspent (void);
+/* Open database for reading */
+extern void setspent(void);
 
-/* Get next entry from database, perhaps after opening the file.  */
-extern struct spwd *getspent (void);
+/* Close database */
+extern void endspent(void);
 
-/* Get shadow entry matching NAME.  */
-extern struct spwd *getspnam (__const char *__name);
+/* Get next entry from database, perhaps after opening the file */
+extern struct spwd *getspent(void);
 
-/* Read shadow entry from STRING.  */
-extern struct spwd *sgetspent (__const char *__string);
+/* Get shadow entry matching NAME */
+extern struct spwd *getspnam(const char *__name);
 
-/* Read next shadow entry from STREAM.  */
-extern struct spwd *fgetspent (FILE *__stream);
+/* Read shadow entry from STRING */
+extern struct spwd *sgetspent(const char *__string);
 
-/* Write line containing shadow password entry to stream.  */
-extern int putspent (__const struct spwd *__p, FILE *__stream);
+/* Read next shadow entry from STREAM */
+extern struct spwd *fgetspent(FILE *__stream);
 
-/* Reentrant versions of some of the functions above.  */
-extern int getspent_r (struct spwd *__result_buf, char *__buffer,
+/* Write line containing shadow password entry to stream */
+extern int putspent(const struct spwd *__p, FILE *__stream);
+
+/* Reentrant versions of some of the functions above */
+extern int getspent_r(struct spwd *__result_buf, char *__buffer,
 		       size_t __buflen, struct spwd **__result);
 
-extern int getspnam_r (__const char *__name, struct spwd *__result_buf,
+extern int getspnam_r(const char *__name, struct spwd *__result_buf,
 		       char *__buffer, size_t __buflen,
-		       struct spwd **__result)__THROW;
+		       struct spwd **__result);
 
-extern int sgetspent_r (__const char *__string, struct spwd *__result_buf,
+extern int sgetspent_r(const char *__string, struct spwd *__result_buf,
 			char *__buffer, size_t __buflen,
 			struct spwd **__result);
 
-extern int fgetspent_r (FILE *__stream, struct spwd *__result_buf,
+extern int fgetspent_r(FILE *__stream, struct spwd *__result_buf,
 			char *__buffer, size_t __buflen,
 			struct spwd **__result);
-/* Protect password file against multi writers.  */
-extern int lckpwdf (void);
+/* Protect password file against multi writers */
+extern int lckpwdf(void);
+
+/* Unlock password file */
+extern int ulckpwdf(void);
 
-/* Unlock password file.  */
-extern int ulckpwdf (void);
+POP_SAVED_FUNCTION_VISIBILITY
 
 #endif /* shadow.h */
-#endif