change uid_t, gid_t, and id_t to unsigned types

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.

diff --git a/arch/arm/bits/alltypes.h.sh b/arch/arm/bits/alltypes.h.sh
index 748b8730b44a98f6a4223b5265eb4de1830991f0..f1aca6667e640be6275a6b7e762cebed02654d0a 100755 (executable)
--- a/arch/arm/bits/alltypes.h.sh
+++ b/arch/arm/bits/alltypes.h.sh
@@ -70,9 +70,9 @@ STRUCT timeval { time_t tv_sec; int tv_usec; };
 STRUCT timespec { time_t tv_sec; long tv_nsec; };
 
 TYPEDEF int pid_t;
-TYPEDEF int id_t;
-TYPEDEF int uid_t;
-TYPEDEF int gid_t;
+TYPEDEF unsigned id_t;
+TYPEDEF unsigned uid_t;
+TYPEDEF unsigned gid_t;
 TYPEDEF int key_t;
 
 TYPEDEF struct __pthread * pthread_t;

diff --git a/arch/i386/bits/alltypes.h.sh b/arch/i386/bits/alltypes.h.sh
index 85776a83feb98ff667211bee0904004f639bc2f3..381e2c9b80ac40ecb45f246b0b31a61133c4f265 100755 (executable)
--- a/arch/i386/bits/alltypes.h.sh
+++ b/arch/i386/bits/alltypes.h.sh
@@ -84,9 +84,9 @@ STRUCT timeval { time_t tv_sec; int tv_usec; };
 STRUCT timespec { time_t tv_sec; long tv_nsec; };
 
 TYPEDEF int pid_t;
-TYPEDEF int id_t;
-TYPEDEF int uid_t;
-TYPEDEF int gid_t;
+TYPEDEF unsigned id_t;
+TYPEDEF unsigned uid_t;
+TYPEDEF unsigned gid_t;
 TYPEDEF int key_t;
 
 TYPEDEF struct __pthread * pthread_t;

diff --git a/arch/microblaze/bits/alltypes.h.sh b/arch/microblaze/bits/alltypes.h.sh
index a5acd494cc6aa882c79715ff16b759ef1f43c79b..032b45a480fb8212246dc10a7fc447978d42a920 100755 (executable)
--- a/arch/microblaze/bits/alltypes.h.sh
+++ b/arch/microblaze/bits/alltypes.h.sh
@@ -70,9 +70,9 @@ STRUCT timeval { time_t tv_sec; int tv_usec; };
 STRUCT timespec { time_t tv_sec; long tv_nsec; };
 
 TYPEDEF int pid_t;
-TYPEDEF int id_t;
-TYPEDEF int uid_t;
-TYPEDEF int gid_t;
+TYPEDEF unsigned id_t;
+TYPEDEF unsigned uid_t;
+TYPEDEF unsigned gid_t;
 TYPEDEF int key_t;
 
 TYPEDEF struct __pthread * pthread_t;

diff --git a/arch/mips/bits/alltypes.h.sh b/arch/mips/bits/alltypes.h.sh
index a5acd494cc6aa882c79715ff16b759ef1f43c79b..032b45a480fb8212246dc10a7fc447978d42a920 100755 (executable)
--- a/arch/mips/bits/alltypes.h.sh
+++ b/arch/mips/bits/alltypes.h.sh
@@ -70,9 +70,9 @@ STRUCT timeval { time_t tv_sec; int tv_usec; };
 STRUCT timespec { time_t tv_sec; long tv_nsec; };
 
 TYPEDEF int pid_t;
-TYPEDEF int id_t;
-TYPEDEF int uid_t;
-TYPEDEF int gid_t;
+TYPEDEF unsigned id_t;
+TYPEDEF unsigned uid_t;
+TYPEDEF unsigned gid_t;
 TYPEDEF int key_t;
 
 TYPEDEF struct __pthread * pthread_t;

diff --git a/arch/powerpc/bits/alltypes.h.sh b/arch/powerpc/bits/alltypes.h.sh
index 77d335bb4da244e28a5fc22f70fbb0e5c590815a..0cb90007150444752c8f5034d23f4eee7913c36b 100755 (executable)
--- a/arch/powerpc/bits/alltypes.h.sh
+++ b/arch/powerpc/bits/alltypes.h.sh
@@ -70,9 +70,9 @@ STRUCT timeval { time_t tv_sec; int tv_usec; };
 STRUCT timespec { time_t tv_sec; long tv_nsec; };
 
 TYPEDEF int pid_t;
-TYPEDEF int id_t;
-TYPEDEF int uid_t;
-TYPEDEF int gid_t;
+TYPEDEF unsigned id_t;
+TYPEDEF unsigned uid_t;
+TYPEDEF unsigned gid_t;
 TYPEDEF int key_t;
 
 TYPEDEF struct __pthread * pthread_t;

diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh
index e5b8d47f78548b7045a578fa9a854fb37bf36e4a..8f122c32dc0e9b5c49da4e082f8ef15585ac9576 100755 (executable)
--- a/arch/x86_64/bits/alltypes.h.sh
+++ b/arch/x86_64/bits/alltypes.h.sh
@@ -70,9 +70,9 @@ STRUCT timeval { time_t tv_sec; long tv_usec; };
 STRUCT timespec { time_t tv_sec; long tv_nsec; };
 
 TYPEDEF int pid_t;
-TYPEDEF int id_t;
-TYPEDEF unsigned int uid_t;
-TYPEDEF unsigned int gid_t;
+TYPEDEF unsigned id_t;
+TYPEDEF unsigned uid_t;
+TYPEDEF unsigned gid_t;
 TYPEDEF int key_t;
 
 TYPEDEF struct __pthread * pthread_t;

diff --git a/src/passwd/getgrent_a.c b/src/passwd/getgrent_a.c
index 780560ddb7a0f91c763797d0b73586fd09797c5b..2cb8521532f8171f366b037d967f71f42eb7f9af 100644 (file)
--- a/src/passwd/getgrent_a.c
+++ b/src/passwd/getgrent_a.c
@@ -1,6 +1,13 @@
 #include "pwf.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)
 {
        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;
                if (!(s = strchr(s, ':'))) continue;
 
-               *s++ = 0; gr->gr_gid = atoi(s);
-               if (!(s = strchr(s, ':'))) continue;
+               *s++ = 0; gr->gr_gid = atou(&s);
+               if (*s != ':') continue;
 
                *s++ = 0; mems = s;
                break;

diff --git a/src/passwd/getpwent_a.c b/src/passwd/getpwent_a.c
index 1bd7f4fcc4ba1b2851707cb8f8c4617943b027fc..34842a07aaab290b81fe8213495527f8f4eb5e80 100644 (file)
--- a/src/passwd/getpwent_a.c
+++ b/src/passwd/getpwent_a.c
@@ -1,6 +1,13 @@
 #include "pwf.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)
 {
        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;
                if (!(s = strchr(s, ':'))) continue;
 
-               *s++ = 0; pw->pw_uid = atoi(s);
-               if (!(s = strchr(s, ':'))) continue;
+               *s++ = 0; pw->pw_uid = atou(&s);
+               if (*s != ':') continue;
 
-               *s++ = 0; pw->pw_gid = atoi(s);
-               if (!(s = strchr(s, ':'))) continue;
+               *s++ = 0; pw->pw_gid = atou(&s);
+               if (*s != ':') continue;
 
                *s++ = 0; pw->pw_gecos = s;
                if (!(s = strchr(s, ':'))) continue;