fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-06-28 06:02:04 +00:00
Code Issues Projects Releases Wiki Activity

change uid_t, gid_t, and id_t to unsigned types

Browse Source 
this change is both to fix one of the remaining type (and thus C++
ABI) mismatches with glibc/LSB and to allow use of the full range of
uid and gid values, if so desired.

passwd/group access functions were not prepared to deal with unsigned
values, so they too have been fixed with this commit.
This commit is contained in:
Rich Felker
2013-07-19 01:34:28 -04:00
parent df065781ee
commit 648c3b4e18
8 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/bits/alltypes.h.sh
View File

@ -70,9 +70,9 @@ STRUCT timeval { time_t tv_sec; int tv_usec; };
STRUCT timespec { time_t tv_sec; long tv_nsec; }; STRUCT timespec { time_t tv_sec; long tv_nsec; };
TYPEDEF int pid_t; TYPEDEF int pid_t;
TYPEDEF int id_t; TYPEDEF unsigned id_t;
TYPEDEF int uid_t; TYPEDEF unsigned uid_t;
TYPEDEF int gid_t; TYPEDEF unsigned gid_t;
TYPEDEF int key_t; TYPEDEF int key_t;
TYPEDEF struct __pthread * pthread_t; TYPEDEF struct __pthread * pthread_t;

6
arch/i386/bits/alltypes.h.sh
View File

@ -84,9 +84,9 @@ STRUCT timeval { time_t tv_sec; int tv_usec; };
STRUCT timespec { time_t tv_sec; long tv_nsec; }; STRUCT timespec { time_t tv_sec; long tv_nsec; };
TYPEDEF int pid_t; TYPEDEF int pid_t;
TYPEDEF int id_t; TYPEDEF unsigned id_t;
TYPEDEF int uid_t; TYPEDEF unsigned uid_t;
TYPEDEF int gid_t; TYPEDEF unsigned gid_t;
TYPEDEF int key_t; TYPEDEF int key_t;
TYPEDEF struct __pthread * pthread_t; TYPEDEF struct __pthread * pthread_t;

6
arch/microblaze/bits/alltypes.h.sh
View File

@ -70,9 +70,9 @@ STRUCT timeval { time_t tv_sec; int tv_usec; };
STRUCT timespec { time_t tv_sec; long tv_nsec; }; STRUCT timespec { time_t tv_sec; long tv_nsec; };
TYPEDEF int pid_t; TYPEDEF int pid_t;
TYPEDEF int id_t; TYPEDEF unsigned id_t;
TYPEDEF int uid_t; TYPEDEF unsigned uid_t;
TYPEDEF int gid_t; TYPEDEF unsigned gid_t;
TYPEDEF int key_t; TYPEDEF int key_t;
TYPEDEF struct __pthread * pthread_t; TYPEDEF struct __pthread * pthread_t;

6
arch/mips/bits/alltypes.h.sh
View File

@ -70,9 +70,9 @@ STRUCT timeval { time_t tv_sec; int tv_usec; };
STRUCT timespec { time_t tv_sec; long tv_nsec; }; STRUCT timespec { time_t tv_sec; long tv_nsec; };
TYPEDEF int pid_t; TYPEDEF int pid_t;
TYPEDEF int id_t; TYPEDEF unsigned id_t;
TYPEDEF int uid_t; TYPEDEF unsigned uid_t;
TYPEDEF int gid_t; TYPEDEF unsigned gid_t;
TYPEDEF int key_t; TYPEDEF int key_t;
TYPEDEF struct __pthread * pthread_t; TYPEDEF struct __pthread * pthread_t;

6
arch/powerpc/bits/alltypes.h.sh
View File

@ -70,9 +70,9 @@ STRUCT timeval { time_t tv_sec; int tv_usec; };
STRUCT timespec { time_t tv_sec; long tv_nsec; }; STRUCT timespec { time_t tv_sec; long tv_nsec; };
TYPEDEF int pid_t; TYPEDEF int pid_t;
TYPEDEF int id_t; TYPEDEF unsigned id_t;
TYPEDEF int uid_t; TYPEDEF unsigned uid_t;
TYPEDEF int gid_t; TYPEDEF unsigned gid_t;
TYPEDEF int key_t; TYPEDEF int key_t;
TYPEDEF struct __pthread * pthread_t; TYPEDEF struct __pthread * pthread_t;

6
arch/x86_64/bits/alltypes.h.sh
View File

@ -70,9 +70,9 @@ STRUCT timeval { time_t tv_sec; long tv_usec; };
STRUCT timespec { time_t tv_sec; long tv_nsec; }; STRUCT timespec { time_t tv_sec; long tv_nsec; };
TYPEDEF int pid_t; TYPEDEF int pid_t;
TYPEDEF int id_t; TYPEDEF unsigned id_t;
TYPEDEF unsigned int uid_t; TYPEDEF unsigned uid_t;
TYPEDEF unsigned int gid_t; TYPEDEF unsigned gid_t;
TYPEDEF int key_t; TYPEDEF int key_t;
TYPEDEF struct __pthread * pthread_t; TYPEDEF struct __pthread * pthread_t;

11
src/passwd/getgrent_a.c
View File

@ -1,6 +1,13 @@
#include "pwf.h" #include "pwf.h"
#include <pthread.h> #include <pthread.h>
static unsigned atou(char **s)
{
unsigned x;
for (x=0; **s-'0'<10U; ++*s) x=10*x+(**s-'0');
return x;
}
struct group *__getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, char ***mem, size_t *nmem) struct group *__getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, char ***mem, size_t *nmem)
{ {
ssize_t l; ssize_t l;
@ -24,8 +31,8 @@ struct group *__getgrent_a(FILE *f, struct group *gr, char **line, size_t *size,
*s++ = 0; gr->gr_passwd = s; *s++ = 0; gr->gr_passwd = s;
if (!(s = strchr(s, ':'))) continue; if (!(s = strchr(s, ':'))) continue;
*s++ = 0; gr->gr_gid = atoi(s); *s++ = 0; gr->gr_gid = atou(&s);
if (!(s = strchr(s, ':'))) continue; if (*s != ':') continue;
*s++ = 0; mems = s; *s++ = 0; mems = s;
break; break;

15
src/passwd/getpwent_a.c
View File

@ -1,6 +1,13 @@
#include "pwf.h" #include "pwf.h"
#include <pthread.h> #include <pthread.h>
static unsigned atou(char **s)
{
unsigned x;
for (x=0; **s-'0'<10U; ++*s) x=10*x+(**s-'0');
return x;
}
struct passwd *__getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *size) struct passwd *__getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *size)
{ {
ssize_t l; ssize_t l;
@ -23,11 +30,11 @@ struct passwd *__getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *siz
*s++ = 0; pw->pw_passwd = s; *s++ = 0; pw->pw_passwd = s;
if (!(s = strchr(s, ':'))) continue; if (!(s = strchr(s, ':'))) continue;
*s++ = 0; pw->pw_uid = atoi(s); *s++ = 0; pw->pw_uid = atou(&s);
if (!(s = strchr(s, ':'))) continue; if (*s != ':') continue;
*s++ = 0; pw->pw_gid = atoi(s); *s++ = 0; pw->pw_gid = atou(&s);
if (!(s = strchr(s, ':'))) continue; if (*s != ':') continue;
*s++ = 0; pw->pw_gecos = s; *s++ = 0; pw->pw_gecos = s;
if (!(s = strchr(s, ':'))) continue; if (!(s = strchr(s, ':'))) continue;