| OLD | NEW |
| 1 #include "pwf.h" | 1 #include "pwf.h" |
| 2 #include <pthread.h> | 2 #include <pthread.h> |
| 3 | 3 |
| 4 #define FIX(x) (gr->gr_##x = gr->gr_##x-line+buf) | 4 #define FIX(x) (gr->gr_##x = gr->gr_##x - line + buf) |
| 5 | 5 |
| 6 static int getgr_r(const char *name, gid_t gid, struct group *gr, char *buf, siz
e_t size, struct group **res) | 6 static int getgr_r(const char* name, |
| 7 { | 7 gid_t gid, |
| 8 » char *line = 0; | 8 struct group* gr, |
| 9 » size_t len = 0; | 9 char* buf, |
| 10 » char **mem = 0; | 10 size_t size, |
| 11 » size_t nmem = 0; | 11 struct group** res) { |
| 12 » int rv = 0; | 12 char* line = 0; |
| 13 » size_t i; | 13 size_t len = 0; |
| 14 » int cs; | 14 char** mem = 0; |
| 15 size_t nmem = 0; |
| 16 int rv = 0; |
| 17 size_t i; |
| 18 int cs; |
| 15 | 19 |
| 16 » pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); | 20 pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); |
| 17 | 21 |
| 18 » rv = __getgr_a(name, gid, gr, &line, &len, &mem, &nmem, res); | 22 rv = __getgr_a(name, gid, gr, &line, &len, &mem, &nmem, res); |
| 19 » if (*res && size < len + (nmem+1)*sizeof(char *) + 32) { | 23 if (*res && size < len + (nmem + 1) * sizeof(char*) + 32) { |
| 20 » » *res = 0; | 24 *res = 0; |
| 21 » » rv = ERANGE; | 25 rv = ERANGE; |
| 22 » } | 26 } |
| 23 » if (*res) { | 27 if (*res) { |
| 24 » » buf += (16-(uintptr_t)buf)%16; | 28 buf += (16 - (uintptr_t)buf) % 16; |
| 25 » » gr->gr_mem = (void *)buf; | 29 gr->gr_mem = (void*)buf; |
| 26 » » buf += (nmem+1)*sizeof(char *); | 30 buf += (nmem + 1) * sizeof(char*); |
| 27 » » memcpy(buf, line, len); | 31 memcpy(buf, line, len); |
| 28 » » FIX(name); | 32 FIX(name); |
| 29 » » FIX(passwd); | 33 FIX(passwd); |
| 30 » » for (i=0; mem[i]; i++) | 34 for (i = 0; mem[i]; i++) |
| 31 » » » gr->gr_mem[i] = mem[i]-line+buf; | 35 gr->gr_mem[i] = mem[i] - line + buf; |
| 32 » » gr->gr_mem[i] = 0; | 36 gr->gr_mem[i] = 0; |
| 33 » } | 37 } |
| 34 » free(mem); | 38 free(mem); |
| 35 » free(line); | 39 free(line); |
| 36 » pthread_setcancelstate(cs, 0); | 40 pthread_setcancelstate(cs, 0); |
| 37 » return rv; | 41 return rv; |
| 38 } | 42 } |
| 39 | 43 |
| 40 int getgrnam_r(const char *name, struct group *gr, char *buf, size_t size, struc
t group **res) | 44 int getgrnam_r(const char* name, |
| 41 { | 45 struct group* gr, |
| 42 » return getgr_r(name, 0, gr, buf, size, res); | 46 char* buf, |
| 47 size_t size, |
| 48 struct group** res) { |
| 49 return getgr_r(name, 0, gr, buf, size, res); |
| 43 } | 50 } |
| 44 | 51 |
| 45 int getgrgid_r(gid_t gid, struct group *gr, char *buf, size_t size, struct group
**res) | 52 int getgrgid_r(gid_t gid, |
| 46 { | 53 struct group* gr, |
| 47 » return getgr_r(0, gid, gr, buf, size, res); | 54 char* buf, |
| 55 size_t size, |
| 56 struct group** res) { |
| 57 return getgr_r(0, gid, gr, buf, size, res); |
| 48 } | 58 } |
| OLD | NEW |