diff options
Diffstat (limited to 'libpwdgrp/pwd_grp.c')
-rw-r--r-- | libpwdgrp/pwd_grp.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c index 18782002d..faf53d7e1 100644 --- a/libpwdgrp/pwd_grp.c +++ b/libpwdgrp/pwd_grp.c | |||
@@ -220,7 +220,7 @@ int sgetspent_r(const char *string, struct spwd *result_buf, | |||
220 | 220 | ||
221 | #ifdef L_getpwnam_r | 221 | #ifdef L_getpwnam_r |
222 | #define GETXXKEY_R_FUNC getpwnam_r | 222 | #define GETXXKEY_R_FUNC getpwnam_r |
223 | #define GETXXKEY_R_PARSER __parsepwent | 223 | #define GETXXKEY_R_PARSER __parsepwent |
224 | #define GETXXKEY_R_ENTTYPE struct passwd | 224 | #define GETXXKEY_R_ENTTYPE struct passwd |
225 | #define GETXXKEY_R_TEST(ENT) (!strcmp((ENT)->pw_name, key)) | 225 | #define GETXXKEY_R_TEST(ENT) (!strcmp((ENT)->pw_name, key)) |
226 | #define DO_GETXXKEY_R_KEYTYPE const char *__restrict | 226 | #define DO_GETXXKEY_R_KEYTYPE const char *__restrict |
@@ -230,7 +230,7 @@ int sgetspent_r(const char *string, struct spwd *result_buf, | |||
230 | 230 | ||
231 | #ifdef L_getgrnam_r | 231 | #ifdef L_getgrnam_r |
232 | #define GETXXKEY_R_FUNC getgrnam_r | 232 | #define GETXXKEY_R_FUNC getgrnam_r |
233 | #define GETXXKEY_R_PARSER __parsegrent | 233 | #define GETXXKEY_R_PARSER __parsegrent |
234 | #define GETXXKEY_R_ENTTYPE struct group | 234 | #define GETXXKEY_R_ENTTYPE struct group |
235 | #define GETXXKEY_R_TEST(ENT) (!strcmp((ENT)->gr_name, key)) | 235 | #define GETXXKEY_R_TEST(ENT) (!strcmp((ENT)->gr_name, key)) |
236 | #define DO_GETXXKEY_R_KEYTYPE const char *__restrict | 236 | #define DO_GETXXKEY_R_KEYTYPE const char *__restrict |
@@ -240,7 +240,7 @@ int sgetspent_r(const char *string, struct spwd *result_buf, | |||
240 | 240 | ||
241 | #ifdef L_getspnam_r | 241 | #ifdef L_getspnam_r |
242 | #define GETXXKEY_R_FUNC getspnam_r | 242 | #define GETXXKEY_R_FUNC getspnam_r |
243 | #define GETXXKEY_R_PARSER __parsespent | 243 | #define GETXXKEY_R_PARSER __parsespent |
244 | #define GETXXKEY_R_ENTTYPE struct spwd | 244 | #define GETXXKEY_R_ENTTYPE struct spwd |
245 | #define GETXXKEY_R_TEST(ENT) (!strcmp((ENT)->sp_namp, key)) | 245 | #define GETXXKEY_R_TEST(ENT) (!strcmp((ENT)->sp_namp, key)) |
246 | #define DO_GETXXKEY_R_KEYTYPE const char *__restrict | 246 | #define DO_GETXXKEY_R_KEYTYPE const char *__restrict |
@@ -250,7 +250,7 @@ int sgetspent_r(const char *string, struct spwd *result_buf, | |||
250 | 250 | ||
251 | #ifdef L_getpwuid_r | 251 | #ifdef L_getpwuid_r |
252 | #define GETXXKEY_R_FUNC getpwuid_r | 252 | #define GETXXKEY_R_FUNC getpwuid_r |
253 | #define GETXXKEY_R_PARSER __parsepwent | 253 | #define GETXXKEY_R_PARSER __parsepwent |
254 | #define GETXXKEY_R_ENTTYPE struct passwd | 254 | #define GETXXKEY_R_ENTTYPE struct passwd |
255 | #define GETXXKEY_R_TEST(ENT) ((ENT)->pw_uid == key) | 255 | #define GETXXKEY_R_TEST(ENT) ((ENT)->pw_uid == key) |
256 | #define DO_GETXXKEY_R_KEYTYPE uid_t | 256 | #define DO_GETXXKEY_R_KEYTYPE uid_t |
@@ -260,7 +260,7 @@ int sgetspent_r(const char *string, struct spwd *result_buf, | |||
260 | 260 | ||
261 | #ifdef L_getgrgid_r | 261 | #ifdef L_getgrgid_r |
262 | #define GETXXKEY_R_FUNC getgrgid_r | 262 | #define GETXXKEY_R_FUNC getgrgid_r |
263 | #define GETXXKEY_R_PARSER __parsegrent | 263 | #define GETXXKEY_R_PARSER __parsegrent |
264 | #define GETXXKEY_R_ENTTYPE struct group | 264 | #define GETXXKEY_R_ENTTYPE struct group |
265 | #define GETXXKEY_R_TEST(ENT) ((ENT)->gr_gid == key) | 265 | #define GETXXKEY_R_TEST(ENT) ((ENT)->gr_gid == key) |
266 | #define DO_GETXXKEY_R_KEYTYPE gid_t | 266 | #define DO_GETXXKEY_R_KEYTYPE gid_t |
@@ -442,7 +442,7 @@ void endpwent(void) | |||
442 | } | 442 | } |
443 | 443 | ||
444 | 444 | ||
445 | int getpwent_r(struct passwd *__restrict resultbuf, | 445 | int getpwent_r(struct passwd *__restrict resultbuf, |
446 | char *__restrict buffer, size_t buflen, | 446 | char *__restrict buffer, size_t buflen, |
447 | struct passwd **__restrict result) | 447 | struct passwd **__restrict result) |
448 | { | 448 | { |
@@ -542,7 +542,7 @@ void endspent(void) | |||
542 | UNLOCK; | 542 | UNLOCK; |
543 | } | 543 | } |
544 | 544 | ||
545 | int getspent_r(struct spwd *resultbuf, char *buffer, | 545 | int getspent_r(struct spwd *resultbuf, char *buffer, |
546 | size_t buflen, struct spwd **result) | 546 | size_t buflen, struct spwd **result) |
547 | { | 547 | { |
548 | int rv; | 548 | int rv; |
@@ -755,11 +755,11 @@ int putgrent(const struct group *__restrict p, FILE *__restrict f) | |||
755 | 755 | ||
756 | static const unsigned char _sp_off[] = { | 756 | static const unsigned char _sp_off[] = { |
757 | offsetof(struct spwd, sp_lstchg), /* 2 - not a char ptr */ | 757 | offsetof(struct spwd, sp_lstchg), /* 2 - not a char ptr */ |
758 | offsetof(struct spwd, sp_min), /* 3 - not a char ptr */ | 758 | offsetof(struct spwd, sp_min), /* 3 - not a char ptr */ |
759 | offsetof(struct spwd, sp_max), /* 4 - not a char ptr */ | 759 | offsetof(struct spwd, sp_max), /* 4 - not a char ptr */ |
760 | offsetof(struct spwd, sp_warn), /* 5 - not a char ptr */ | 760 | offsetof(struct spwd, sp_warn), /* 5 - not a char ptr */ |
761 | offsetof(struct spwd, sp_inact), /* 6 - not a char ptr */ | 761 | offsetof(struct spwd, sp_inact), /* 6 - not a char ptr */ |
762 | offsetof(struct spwd, sp_expire), /* 7 - not a char ptr */ | 762 | offsetof(struct spwd, sp_expire), /* 7 - not a char ptr */ |
763 | }; | 763 | }; |
764 | 764 | ||
765 | int putspent(const struct spwd *p, FILE *stream) | 765 | int putspent(const struct spwd *p, FILE *stream) |
@@ -801,18 +801,18 @@ DO_UNLOCK: | |||
801 | 801 | ||
802 | #endif | 802 | #endif |
803 | /**********************************************************************/ | 803 | /**********************************************************************/ |
804 | /* Internal uClibc functions. */ | 804 | /* Internal uClibc functions. */ |
805 | /**********************************************************************/ | 805 | /**********************************************************************/ |
806 | #ifdef L___parsepwent | 806 | #ifdef L___parsepwent |
807 | 807 | ||
808 | static const unsigned char pw_off[] = { | 808 | static const unsigned char pw_off[] = { |
809 | offsetof(struct passwd, pw_name), /* 0 */ | 809 | offsetof(struct passwd, pw_name), /* 0 */ |
810 | offsetof(struct passwd, pw_passwd), /* 1 */ | 810 | offsetof(struct passwd, pw_passwd), /* 1 */ |
811 | offsetof(struct passwd, pw_uid), /* 2 - not a char ptr */ | 811 | offsetof(struct passwd, pw_uid), /* 2 - not a char ptr */ |
812 | offsetof(struct passwd, pw_gid), /* 3 - not a char ptr */ | 812 | offsetof(struct passwd, pw_gid), /* 3 - not a char ptr */ |
813 | offsetof(struct passwd, pw_gecos), /* 4 */ | 813 | offsetof(struct passwd, pw_gecos), /* 4 */ |
814 | offsetof(struct passwd, pw_dir), /* 5 */ | 814 | offsetof(struct passwd, pw_dir), /* 5 */ |
815 | offsetof(struct passwd, pw_shell) /* 6 */ | 815 | offsetof(struct passwd, pw_shell) /* 6 */ |
816 | }; | 816 | }; |
817 | 817 | ||
818 | int __parsepwent(void *data, char *line) | 818 | int __parsepwent(void *data, char *line) |
@@ -825,7 +825,7 @@ int __parsepwent(void *data, char *line) | |||
825 | do { | 825 | do { |
826 | p = ((char *) ((struct passwd *) data)) + pw_off[i]; | 826 | p = ((char *) ((struct passwd *) data)) + pw_off[i]; |
827 | 827 | ||
828 | if ((i & 6) ^ 2) { /* i!=2 and i!=3 */ | 828 | if ((i & 6) ^ 2) { /* i!=2 and i!=3 */ |
829 | *((char **) p) = line; | 829 | *((char **) p) = line; |
830 | if (i==6) { | 830 | if (i==6) { |
831 | return 0; | 831 | return 0; |
@@ -865,7 +865,7 @@ int __parsepwent(void *data, char *line) | |||
865 | #ifdef L___parsegrent | 865 | #ifdef L___parsegrent |
866 | 866 | ||
867 | static const unsigned char gr_off[] = { | 867 | static const unsigned char gr_off[] = { |
868 | offsetof(struct group, gr_name), /* 0 */ | 868 | offsetof(struct group, gr_name), /* 0 */ |
869 | offsetof(struct group, gr_passwd), /* 1 */ | 869 | offsetof(struct group, gr_passwd), /* 1 */ |
870 | offsetof(struct group, gr_gid) /* 2 - not a char ptr */ | 870 | offsetof(struct group, gr_gid) /* 2 - not a char ptr */ |
871 | }; | 871 | }; |
@@ -947,7 +947,7 @@ int __parsegrent(void *data, char *line) | |||
947 | if (!--i) break; | 947 | if (!--i) break; |
948 | while (*++p) {} | 948 | while (*++p) {} |
949 | } while (1); | 949 | } while (1); |
950 | } | 950 | } |
951 | *members = NULL; | 951 | *members = NULL; |
952 | 952 | ||
953 | return 0; | 953 | return 0; |
@@ -966,12 +966,12 @@ static const unsigned char sp_off[] = { | |||
966 | offsetof(struct spwd, sp_namp), /* 0 */ | 966 | offsetof(struct spwd, sp_namp), /* 0 */ |
967 | offsetof(struct spwd, sp_pwdp), /* 1 */ | 967 | offsetof(struct spwd, sp_pwdp), /* 1 */ |
968 | offsetof(struct spwd, sp_lstchg), /* 2 - not a char ptr */ | 968 | offsetof(struct spwd, sp_lstchg), /* 2 - not a char ptr */ |
969 | offsetof(struct spwd, sp_min), /* 3 - not a char ptr */ | 969 | offsetof(struct spwd, sp_min), /* 3 - not a char ptr */ |
970 | offsetof(struct spwd, sp_max), /* 4 - not a char ptr */ | 970 | offsetof(struct spwd, sp_max), /* 4 - not a char ptr */ |
971 | offsetof(struct spwd, sp_warn), /* 5 - not a char ptr */ | 971 | offsetof(struct spwd, sp_warn), /* 5 - not a char ptr */ |
972 | offsetof(struct spwd, sp_inact), /* 6 - not a char ptr */ | 972 | offsetof(struct spwd, sp_inact), /* 6 - not a char ptr */ |
973 | offsetof(struct spwd, sp_expire), /* 7 - not a char ptr */ | 973 | offsetof(struct spwd, sp_expire), /* 7 - not a char ptr */ |
974 | offsetof(struct spwd, sp_flag) /* 8 - not a char ptr */ | 974 | offsetof(struct spwd, sp_flag) /* 8 - not a char ptr */ |
975 | }; | 975 | }; |
976 | 976 | ||
977 | int __parsespent(void *data, char * line) | 977 | int __parsespent(void *data, char * line) |