X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fshadow_.h;h=8e2581e7cddafbdf3f254df574268d1beb48baf5;hb=2b1559056cf32c42675ecd937796e1455bcb5c2c;hp=fb2153c5297591de4dbaebff63671a3b8ef6899a;hpb=cb04ff5c68c1363837d8cd9f2170bdf64625b872;p=oweals%2Fbusybox.git

diff --git a/include/shadow_.h b/include/shadow_.h
index fb2153c52..8e2581e7c 100644
--- a/include/shadow_.h
+++ b/include/shadow_.h
@@ -19,34 +19,24 @@
 
 /* Declaration of types and functions for shadow password suite */
 
-#if !ENABLE_USE_BB_SHADOW
+#ifndef BB_SHADOW_H
+#define BB_SHADOW_H 1
 
-#include <shadow.h>
-
-#else
-
-#ifndef _SHADOW_H
-#define _SHADOW_H 1
-
-/* Paths to the user database files */
-#ifndef _PATH_SHADOW
-#define _PATH_SHADOW "/etc/shadow"
-#endif
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
 /* 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 */
+	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 */
 };
 
-
 #define setspent    bb_internal_setspent
 #define endspent    bb_internal_endspent
 #define getspent    bb_internal_getspent
@@ -63,52 +53,54 @@ struct spwd {
 
 
 /* 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 */
-
+ * in order to not collide with libc names. */
 
+#ifdef UNUSED_FOR_NOW
 /* Open database for reading */
-extern void setspent(void);
+void FAST_FUNC setspent(void);
 
 /* Close database */
-extern void endspent(void);
+void FAST_FUNC endspent(void);
 
 /* Get next entry from database, perhaps after opening the file */
-extern struct spwd *getspent(void);
+struct spwd* FAST_FUNC getspent(void);
 
 /* Get shadow entry matching NAME */
-extern struct spwd *getspnam(__const char *__name);
+struct spwd* FAST_FUNC getspnam(const char *__name);
 
 /* Read shadow entry from STRING */
-extern struct spwd *sgetspent(__const char *__string);
+struct spwd* FAST_FUNC sgetspent(const char *__string);
 
 /* Read next shadow entry from STREAM */
-extern struct spwd *fgetspent(FILE *__stream);
+struct spwd* FAST_FUNC fgetspent(FILE *__stream);
 
 /* Write line containing shadow password entry to stream */
-extern int putspent(__const struct spwd *__p, FILE *__stream);
+int FAST_FUNC 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);
+int FAST_FUNC getspent_r(struct spwd *__result_buf, char *__buffer,
+		size_t __buflen, struct spwd **__result);
+#endif
 
-extern int getspnam_r(__const char *__name, struct spwd *__result_buf,
-		       char *__buffer, size_t __buflen,
-		       struct spwd **__result);
+int FAST_FUNC getspnam_r(const char *__name, struct spwd *__result_buf,
+		char *__buffer, size_t __buflen,
+		struct spwd **__result);
 
-extern int sgetspent_r(__const char *__string, struct spwd *__result_buf,
-			char *__buffer, size_t __buflen,
-			struct spwd **__result);
+#ifdef UNUSED_FOR_NOW
+int FAST_FUNC 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,
-			char *__buffer, size_t __buflen,
-			struct spwd **__result);
+int FAST_FUNC 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);
+int FAST_FUNC lckpwdf(void);
 
 /* Unlock password file */
-extern int ulckpwdf(void);
+int FAST_FUNC ulckpwdf(void);
+#endif
+
+POP_SAVED_FUNCTION_VISIBILITY
 
 #endif /* shadow.h */
-#endif