diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-31 12:38:17 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-31 12:38:17 +0200 |
| commit | 55301297d3e4c05ec37faf1e1695f79a74ce2cab (patch) | |
| tree | 6295d785b8585a56ebe666dcec9c554dd51c884d /libpwdgrp | |
| parent | 17fcd72add2a94c9542dba72124032b54838cb50 (diff) | |
| download | busybox-w32-55301297d3e4c05ec37faf1e1695f79a74ce2cab.tar.gz busybox-w32-55301297d3e4c05ec37faf1e1695f79a74ce2cab.tar.bz2 busybox-w32-55301297d3e4c05ec37faf1e1695f79a74ce2cab.zip | |
libpwdgrp: comment out functions with UNUSED_SINCE_WE_AVOID_STATIC_BUFS
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libpwdgrp')
| -rw-r--r-- | libpwdgrp/pwd_grp.c | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c index 26e8ff469..5c61e5638 100644 --- a/libpwdgrp/pwd_grp.c +++ b/libpwdgrp/pwd_grp.c | |||
| @@ -187,7 +187,7 @@ int fgetspent_r(FILE *__restrict stream, struct spwd *__restrict resultbuf, | |||
| 187 | * TODO: audit & stop using these in bbox, they pull in static buffers */ | 187 | * TODO: audit & stop using these in bbox, they pull in static buffers */ |
| 188 | /**********************************************************************/ | 188 | /**********************************************************************/ |
| 189 | 189 | ||
| 190 | #if 0 | 190 | #ifdef UNUSED_SINCE_WE_AVOID_STATIC_BUFS |
| 191 | struct passwd *fgetpwent(FILE *stream) | 191 | struct passwd *fgetpwent(FILE *stream) |
| 192 | { | 192 | { |
| 193 | struct statics *S; | 193 | struct statics *S; |
| @@ -399,35 +399,6 @@ struct spwd *getspnam(const char *name) | |||
| 399 | } | 399 | } |
| 400 | #endif | 400 | #endif |
| 401 | 401 | ||
| 402 | #ifdef THIS_ONE_IS_UNUSED | ||
| 403 | /* This one doesn't use static buffers */ | ||
| 404 | int getpw(uid_t uid, char *buf) | ||
| 405 | { | ||
| 406 | struct passwd resultbuf; | ||
| 407 | struct passwd *result; | ||
| 408 | char buffer[PWD_BUFFER_SIZE]; | ||
| 409 | |||
| 410 | if (!buf) { | ||
| 411 | errno = EINVAL; | ||
| 412 | return -1; | ||
| 413 | } | ||
| 414 | |||
| 415 | if (!getpwuid_r(uid, &resultbuf, buffer, sizeof(buffer), &result)) { | ||
| 416 | if (sprintf(buf, "%s:%s:%lu:%lu:%s:%s:%s\n", | ||
| 417 | resultbuf.pw_name, resultbuf.pw_passwd, | ||
| 418 | (unsigned long)(resultbuf.pw_uid), | ||
| 419 | (unsigned long)(resultbuf.pw_gid), | ||
| 420 | resultbuf.pw_gecos, resultbuf.pw_dir, | ||
| 421 | resultbuf.pw_shell) >= 0 | ||
| 422 | ) { | ||
| 423 | return 0; | ||
| 424 | } | ||
| 425 | } | ||
| 426 | |||
| 427 | return -1; | ||
| 428 | } | ||
| 429 | #endif | ||
| 430 | |||
| 431 | /**********************************************************************/ | 402 | /**********************************************************************/ |
| 432 | 403 | ||
| 433 | /* FIXME: we don't have such CONFIG_xx - ?! */ | 404 | /* FIXME: we don't have such CONFIG_xx - ?! */ |
| @@ -584,7 +555,7 @@ int getspent_r(struct spwd *resultbuf, char *buffer, | |||
| 584 | } | 555 | } |
| 585 | #endif | 556 | #endif |
| 586 | 557 | ||
| 587 | #if 0 | 558 | #ifdef UNUSED_SINCE_WE_AVOID_STATIC_BUFS |
| 588 | struct passwd *getpwent(void) | 559 | struct passwd *getpwent(void) |
| 589 | { | 560 | { |
| 590 | static char line_buff[PWD_BUFFER_SIZE]; | 561 | static char line_buff[PWD_BUFFER_SIZE]; |
| @@ -687,6 +658,7 @@ int getgrouplist(const char *user, gid_t gid, gid_t *groups, int *ngroups) | |||
| 687 | return ngroups_old; | 658 | return ngroups_old; |
| 688 | } | 659 | } |
| 689 | 660 | ||
| 661 | #ifdef UNUSED_SINCE_WE_AVOID_STATIC_BUFS | ||
| 690 | int putpwent(const struct passwd *__restrict p, FILE *__restrict f) | 662 | int putpwent(const struct passwd *__restrict p, FILE *__restrict f) |
| 691 | { | 663 | { |
| 692 | int rv = -1; | 664 | int rv = -1; |
| @@ -749,6 +721,7 @@ int putgrent(const struct group *__restrict p, FILE *__restrict f) | |||
| 749 | 721 | ||
| 750 | return rv; | 722 | return rv; |
| 751 | } | 723 | } |
| 724 | #endif | ||
| 752 | 725 | ||
| 753 | #if ENABLE_USE_BB_SHADOW | 726 | #if ENABLE_USE_BB_SHADOW |
| 754 | static const unsigned char put_sp_off[] ALIGN1 = { | 727 | static const unsigned char put_sp_off[] ALIGN1 = { |