cleaning up syscalls in preparation for x86_64 port

- hide all the legacy xxxxxx32 name cruft in syscall.h so the actual
source files can be clean and uniform across all archs.

- cleanup llseek/lseek and mmap2/mmap handling for 32/64 bit systems

- alternate implementation for nice if the target lacks nice syscall

diff --git a/src/internal/syscall.h b/src/internal/syscall.h
index 4b3c0a733c7ff4f2b903672d2da8345c7596fe81..901263bae9c9f08a4959fd9430060cd1176b1d4e 100644 (file)
--- a/src/internal/syscall.h
+++ b/src/internal/syscall.h
@@ -439,6 +439,46 @@ static inline long syscall6(long n, long a1, long a2, long a3, long a4, long a5,
 #define __NR_preadv            333
 #define __NR_pwritev           334
 
+/* fixup legacy 16-bit junk */
+#undef __NR_lchown
+#undef __NR_getuid
+#undef __NR_getgid
+#undef __NR_geteuid
+#undef __NR_getegid
+#undef __NR_setreuid
+#undef __NR_setregid
+#undef __NR_getgroups
+#undef __NR_setgroups
+#undef __NR_fchown
+#undef __NR_setresuid
+#undef __NR_getresuid
+#undef __NR_setresgid
+#undef __NR_getresgid
+#undef __NR_chown
+#undef __NR_setuid
+#undef __NR_setgid
+#undef __NR_setfsuid
+#undef __NR_setfsgid
+#define __NR_lchown __NR_lchown32
+#define __NR_getuid __NR_getuid32
+#define __NR_getgid __NR_getgid32
+#define __NR_geteuid __NR_geteuid32
+#define __NR_getegid __NR_getegid32
+#define __NR_setreuid __NR_setreuid32
+#define __NR_setregid __NR_setregid32
+#define __NR_getgroups __NR_getgroups32
+#define __NR_setgroups __NR_setgroups32
+#define __NR_fchown __NR_fchown32
+#define __NR_setresuid __NR_setresuid32
+#define __NR_getresuid __NR_getresuid32
+#define __NR_setresgid __NR_setresgid32
+#define __NR_getresgid __NR_getresgid32
+#define __NR_chown __NR_chown32
+#define __NR_setuid __NR_setuid32
+#define __NR_setgid __NR_setgid32
+#define __NR_setfsuid __NR_setfsuid32
+#define __NR_setfsgid __NR_setfsgid32
+
 
 #undef O_LARGEFILE
 #define O_LARGEFILE 0100000
@@ -457,13 +497,4 @@ static inline long syscall6(long n, long a1, long a2, long a3, long a4, long a5,
 #define __syscall_ioctl(fd,ioc,arg)           syscall3(__NR_ioctl, (fd), (ioc), (long)(arg))
 #define __syscall_exit(code)                  syscall1(__NR_exit, code)
 
-#define __NEED_off_t
-#include <bits/alltypes.h>
-
-static inline off_t __syscall_lseek(int fd, off_t offset, int whence)
-{
-       off_t result;
-       return syscall5(__NR__llseek, fd, offset>>32, offset, (long)&result, whence) ? -1 : result;
-}
-
 #endif

diff --git a/src/linux/setgroups.c b/src/linux/setgroups.c
index 2368aa0d772a8a6b9c3523572deca96945dc1f91..4d578013d7cd15e3b7ba14720dbcd5d036028fbc 100644 (file)
--- a/src/linux/setgroups.c
+++ b/src/linux/setgroups.c
@@ -1,9 +1,7 @@
 #include <unistd.h>
-#define SYSCALL_STANDALONE
 #include "syscall.h"
 
 int setgroups(int count, const gid_t list[])
 {
-       /* this depends on our gid_t being 32bit */
-       return syscall2(__NR_setgroups32, count, (long)list);
+       return syscall2(__NR_setgroups, count, (long)list);
 }

diff --git a/src/mman/mmap.c b/src/mman/mmap.c
index 93c76582a5dfc77057e41c4b022098d5fc6c1067..5be6e12de13abaaae2f3af473d6c559216e4821f 100644 (file)
--- a/src/mman/mmap.c
+++ b/src/mman/mmap.c
@@ -10,7 +10,11 @@ void *__mmap(void *start, size_t len, int prot, int flags, int fd, off_t off)
        if (sizeof(off_t) > sizeof(long))
                if (((long)off & 0xfff) | ((long)((unsigned long long)off>>(12 + 8*(sizeof(off_t)-sizeof(long))))))
                        start = (void *)-1;
+#ifdef __NR_mmap2
        return (void *)syscall6(__NR_mmap2, (long)start, len, prot, flags, fd, off>>12);
+#else
+       return (void *)syscall6(__NR_mmap, (long)start, len, prot, flags, fd, off);
+#endif
 }
 
 weak_alias(__mmap, mmap);

diff --git a/src/stdio/__stdio_seek.c b/src/stdio/__stdio_seek.c
index fdb9fe7f2ff086ee364065fa68506c0b6eed1563..c7a5b73066f6de8d6ed46be823b0647f7b00af37 100644 (file)
--- a/src/stdio/__stdio_seek.c
+++ b/src/stdio/__stdio_seek.c
@@ -7,7 +7,13 @@ static off_t retneg1(FILE *f, off_t off, int whence)
 
 off_t __stdio_seek(FILE *f, off_t off, int whence)
 {
-       off_t ret = __syscall_lseek(f->fd, off, whence);
+       off_t ret;
+#ifdef __NR__llseek
+       if (syscall5(__NR__llseek, f->fd, off>>32, off, (long)&ret, whence)<0)
+               ret = -1;
+#else
+       ret = syscall3(__NR_lseek, f->fd, off, whence);
+#endif
        /* Detect unseekable files and optimize future failures out */
        if (ret < 0 && off == 0 && whence == SEEK_CUR)
                f->seek = retneg1;

diff --git a/src/unistd/chown.c b/src/unistd/chown.c
index 6069a2fee0249462480d37d1cfeeccab18d33331..b89b17355973d2b7a89cd8f94fad8ff1df0c8d92 100644 (file)
--- a/src/unistd/chown.c
+++ b/src/unistd/chown.c
@@ -3,5 +3,5 @@
 
 int chown(const char *path, uid_t uid, gid_t gid)
 {
-       return syscall3(__NR_chown32, (long)path, uid, gid);
+       return syscall3(__NR_chown, (long)path, uid, gid);
 }

diff --git a/src/unistd/fchown.c b/src/unistd/fchown.c
index 990f006da2dba7bf3b792a5de3de41b3d9cc4019..6050b77417c2c896f7bab5fe49f69c5a3a79015a 100644 (file)
--- a/src/unistd/fchown.c
+++ b/src/unistd/fchown.c
@@ -3,5 +3,5 @@
 
 int fchown(int fd, uid_t uid, gid_t gid)
 {
-       return syscall3(__NR_fchown32, fd, uid, gid);
+       return syscall3(__NR_fchown, fd, uid, gid);
 }

diff --git a/src/unistd/getegid.c b/src/unistd/getegid.c
index 0e626b75de6fc5614959c00114d7ed3ce173b78d..33ee2057227f71781db535fc4ffd5a6c4054fc72 100644 (file)
--- a/src/unistd/getegid.c
+++ b/src/unistd/getegid.c
@@ -3,5 +3,5 @@
 
 gid_t getegid(void)
 {
-       return syscall0(__NR_getegid32);
+       return syscall0(__NR_getegid);
 }

diff --git a/src/unistd/geteuid.c b/src/unistd/geteuid.c
index 39d6ac7becd66c8b6df915aae125a085d3f1e5b3..cdec631a6aea1612f103cc5213347f71205e5fed 100644 (file)
--- a/src/unistd/geteuid.c
+++ b/src/unistd/geteuid.c
@@ -3,5 +3,5 @@
 
 uid_t geteuid(void)
 {
-       return syscall0(__NR_geteuid32);
+       return syscall0(__NR_geteuid);
 }

diff --git a/src/unistd/getgid.c b/src/unistd/getgid.c
index 186635a21266be3533dcd5915f6372ce65f6470a..8a4590be92a46439b2ee2aa161d5ebf639f9347c 100644 (file)
--- a/src/unistd/getgid.c
+++ b/src/unistd/getgid.c
@@ -3,5 +3,5 @@
 
 gid_t getgid(void)
 {
-       return syscall0(__NR_getgid32);
+       return syscall0(__NR_getgid);
 }

diff --git a/src/unistd/getgroups.c b/src/unistd/getgroups.c
index 6f19870e6f9160999f7365a022a820163ae9c1f9..37619b9a5445019b808187f361cbc55caba6836b 100644 (file)
--- a/src/unistd/getgroups.c
+++ b/src/unistd/getgroups.c
@@ -3,6 +3,5 @@
 
 int getgroups(int count, gid_t list[])
 {
-       /* this depends on our gid_t being 32bit */
-       return syscall2(__NR_getgroups32, count, (long)list);
+       return syscall2(__NR_getgroups, count, (long)list);
 }

diff --git a/src/unistd/getuid.c b/src/unistd/getuid.c
index 9d4e53f5d2a28cec40e7abbdd7435db5892be7e0..cd7233d1f7cb4c20ecf28b2c4b3c23bdc85a90ad 100644 (file)
--- a/src/unistd/getuid.c
+++ b/src/unistd/getuid.c
@@ -3,5 +3,5 @@
 
 uid_t getuid(void)
 {
-       return syscall0(__NR_getuid32);
+       return syscall0(__NR_getuid);
 }

diff --git a/src/unistd/lchown.c b/src/unistd/lchown.c
index 30e839167f7c3d0f320e1c1d5e70553e7c1186e7..a8402132561a5fb86284153787af9f7bd4ac6426 100644 (file)
--- a/src/unistd/lchown.c
+++ b/src/unistd/lchown.c
@@ -3,5 +3,5 @@
 
 int lchown(const char *path, uid_t uid, gid_t gid)
 {
-       return syscall3(__NR_lchown32, (long)path, uid, gid);
+       return syscall3(__NR_lchown, (long)path, uid, gid);
 }

diff --git a/src/unistd/lseek.c b/src/unistd/lseek.c
index 0dab2679196e9c840d1f85034ca8a09f39a36139..0152866f8df42302f9bfb947796fef3c423dbb6a 100644 (file)
--- a/src/unistd/lseek.c
+++ b/src/unistd/lseek.c
@@ -4,13 +4,12 @@
 
 off_t lseek(int fd, off_t offset, int whence)
 {
-       /* optimized away at compiletime */
-       if (sizeof(long) == 8)
-               return syscall3(__NR_lseek, fd, offset, whence);
-       else {
-               off_t result;
-               return syscall5(__NR__llseek, fd, offset>>32, offset, (long)&result, whence) ? -1 : result;
-       }
+#ifdef __NR__llseek
+       off_t result;
+       return syscall5(__NR__llseek, fd, offset>>32, offset, (long)&result, whence) ? -1 : result;
+#else
+       return syscall3(__NR_lseek, fd, offset, whence);
+#endif
 }
 
 LFS64(lseek);

diff --git a/src/unistd/nice.c b/src/unistd/nice.c
index 4b28ef41fec1bb45531a491284267a5032bca604..f38db678d892c7c570e2f4226090922bda1d55c5 100644 (file)
--- a/src/unistd/nice.c
+++ b/src/unistd/nice.c
@@ -1,7 +1,12 @@
 #include <unistd.h>
+#include <sys/resource.h>
 #include "syscall.h"
 
 int nice(int inc)
 {
+#ifdef __NR_nice
        return syscall1(__NR_nice, inc);
+#else
+       return setpriority(PRIO_PROCESS, 0, getpriority(PRIO_PROCESS, 0)+inc);
+#endif
 }

diff --git a/src/unistd/setgid.c b/src/unistd/setgid.c
index 00c7a03a4a8ff92e7b529b3b30a20a5939b9099e..42976d9510c2b97832d9d2585861174c230c2838 100644 (file)
--- a/src/unistd/setgid.c
+++ b/src/unistd/setgid.c
@@ -4,6 +4,6 @@
 
 int setgid(gid_t gid)
 {
-       if (libc.rsyscall) return libc.rsyscall(__NR_setgid32, gid, 0, 0, 0, 0, 0);
-       return syscall1(__NR_setgid32, gid);
+       if (libc.rsyscall) return libc.rsyscall(__NR_setgid, gid, 0, 0, 0, 0, 0);
+       return syscall1(__NR_setgid, gid);
 }

diff --git a/src/unistd/setregid.c b/src/unistd/setregid.c
index d25dab76ac96d7c61786f7ffb22f20f876124d8c..158753bea0e3d0a14d69db95f79c51c7c912c952 100644 (file)
--- a/src/unistd/setregid.c
+++ b/src/unistd/setregid.c
@@ -4,6 +4,6 @@
 
 int setregid(gid_t rgid, gid_t egid)
 {
-       if (libc.rsyscall) return libc.rsyscall(__NR_setregid32, rgid, egid, 0, 0, 0, 0);
-       return syscall2(__NR_setregid32, rgid, egid);
+       if (libc.rsyscall) return libc.rsyscall(__NR_setregid, rgid, egid, 0, 0, 0, 0);
+       return syscall2(__NR_setregid, rgid, egid);
 }

diff --git a/src/unistd/setreuid.c b/src/unistd/setreuid.c
index 0ba2277b673c73d698e7ebfddab3f8fba3d30826..47c6730658c6298fc3f16919f8d9496c222a2719 100644 (file)
--- a/src/unistd/setreuid.c
+++ b/src/unistd/setreuid.c
@@ -4,6 +4,6 @@
 
 int setreuid(uid_t ruid, uid_t euid)
 {
-       if (libc.rsyscall) return libc.rsyscall(__NR_setreuid32, ruid, euid, 0, 0, 0, 0);
-       return syscall2(__NR_setreuid32, ruid, euid);
+       if (libc.rsyscall) return libc.rsyscall(__NR_setreuid, ruid, euid, 0, 0, 0, 0);
+       return syscall2(__NR_setreuid, ruid, euid);
 }

diff --git a/src/unistd/setuid.c b/src/unistd/setuid.c
index 53b74d886762127e743e8dce64e22ca8269d63a4..9e9da61fac39a1870c22d5c8e3065aaee815097f 100644 (file)
--- a/src/unistd/setuid.c
+++ b/src/unistd/setuid.c
@@ -4,6 +4,6 @@
 
 int setuid(uid_t uid)
 {
-       if (libc.rsyscall) return libc.rsyscall(__NR_setuid32, uid, 0, 0, 0, 0, 0);
-       return syscall1(__NR_setuid32, uid);
+       if (libc.rsyscall) return libc.rsyscall(__NR_setuid, uid, 0, 0, 0, 0, 0);
+       return syscall1(__NR_setuid, uid);
 }