| Index: fusl/src/passwd/getpw_r.c
|
| diff --git a/fusl/src/passwd/getpw_r.c b/fusl/src/passwd/getpw_r.c
|
| index e8cc811e4d898f91c26d05b16b4456fda9d6601b..6e2c87d619d276d13c264d7ac9080033ebfe0992 100644
|
| --- a/fusl/src/passwd/getpw_r.c
|
| +++ b/fusl/src/passwd/getpw_r.c
|
| @@ -1,41 +1,51 @@
|
| #include "pwf.h"
|
| #include <pthread.h>
|
|
|
| -#define FIX(x) (pw->pw_##x = pw->pw_##x-line+buf)
|
| +#define FIX(x) (pw->pw_##x = pw->pw_##x - line + buf)
|
|
|
| -static int getpw_r(const char *name, uid_t uid, struct passwd *pw, char *buf, size_t size, struct passwd **res)
|
| -{
|
| - char *line = 0;
|
| - size_t len = 0;
|
| - int rv = 0;
|
| - int cs;
|
| +static int getpw_r(const char* name,
|
| + uid_t uid,
|
| + struct passwd* pw,
|
| + char* buf,
|
| + size_t size,
|
| + struct passwd** res) {
|
| + char* line = 0;
|
| + size_t len = 0;
|
| + int rv = 0;
|
| + int cs;
|
|
|
| - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
|
| + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
|
|
|
| - rv = __getpw_a(name, uid, pw, &line, &len, res);
|
| - if (*res && size < len) {
|
| - *res = 0;
|
| - rv = ERANGE;
|
| - }
|
| - if (*res) {
|
| - memcpy(buf, line, len);
|
| - FIX(name);
|
| - FIX(passwd);
|
| - FIX(gecos);
|
| - FIX(dir);
|
| - FIX(shell);
|
| - }
|
| - free(line);
|
| - pthread_setcancelstate(cs, 0);
|
| - return rv;
|
| + rv = __getpw_a(name, uid, pw, &line, &len, res);
|
| + if (*res && size < len) {
|
| + *res = 0;
|
| + rv = ERANGE;
|
| + }
|
| + if (*res) {
|
| + memcpy(buf, line, len);
|
| + FIX(name);
|
| + FIX(passwd);
|
| + FIX(gecos);
|
| + FIX(dir);
|
| + FIX(shell);
|
| + }
|
| + free(line);
|
| + pthread_setcancelstate(cs, 0);
|
| + return rv;
|
| }
|
|
|
| -int getpwnam_r(const char *name, struct passwd *pw, char *buf, size_t size, struct passwd **res)
|
| -{
|
| - return getpw_r(name, 0, pw, buf, size, res);
|
| +int getpwnam_r(const char* name,
|
| + struct passwd* pw,
|
| + char* buf,
|
| + size_t size,
|
| + struct passwd** res) {
|
| + return getpw_r(name, 0, pw, buf, size, res);
|
| }
|
|
|
| -int getpwuid_r(uid_t uid, struct passwd *pw, char *buf, size_t size, struct passwd **res)
|
| -{
|
| - return getpw_r(0, uid, pw, buf, size, res);
|
| +int getpwuid_r(uid_t uid,
|
| + struct passwd* pw,
|
| + char* buf,
|
| + size_t size,
|
| + struct passwd** res) {
|
| + return getpw_r(0, uid, pw, buf, size, res);
|
| }
|
|
|