commit 4994deaef51d5fa1ac12e6160b47d9cbe3b2bc43
author Elliott Hughes <enh@google.com> Mon Apr 16 09:09:04 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Mon Apr 16 09:09:05 2012 -0700
tree 83d2a1780ad295899ea3ed18dea561f107de76c8
parent 7b8666e683e56549091b86fd7b9c421fd0124dbc
parent d515ce465be909d830a39462c3f196b5d7f35c66

Merge "Bionic: Fix wrong prototype of system call clock_nanosleep"

libc/SYSCALLS.TXT

diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT
index 333efba..765d2fa 100644
--- a/libc/SYSCALLS.TXT
+++ b/libc/SYSCALLS.TXT
@@ -47,8 +47,8 @@
 gid_t   getgid:getgid32 ()         200
 uid_t   geteuid:geteuid32 ()       201
 gid_t   getegid:getegid32 ()       202
-uid_t   getresuid:getresuid32 ()   209
-gid_t   getresgid:getresgid32 ()   211
+uid_t   getresuid:getresuid32 (uid_t *ruid, uid_t *euid, uid_t *suid)   209
+gid_t   getresgid:getresgid32 (gid_t *rgid, gid_t *egid, gid_t *sgid)   211
 pid_t   gettid()                   224
 ssize_t readahead(int, off64_t, size_t)     225
 int     getgroups:getgroups32(int, gid_t *)    205

libc/arch-x86/syscalls/getresgid.S

diff --git a/libc/arch-x86/syscalls/getresgid.S b/libc/arch-x86/syscalls/getresgid.S
index 454d32b..d43aec4 100644
--- a/libc/arch-x86/syscalls/getresgid.S
+++ b/libc/arch-x86/syscalls/getresgid.S
@@ -7,6 +7,12 @@
     .align 4
 
 getresgid:
+    pushl   %ebx
+    pushl   %ecx
+    pushl   %edx
+    mov     16(%esp), %ebx
+    mov     20(%esp), %ecx
+    mov     24(%esp), %edx
     movl    $__NR_getresgid32, %eax
     int     $0x80
     cmpl    $-129, %eax
@@ -17,4 +23,7 @@
     addl    $4, %esp
     orl     $-1, %eax
 1:
+    popl    %edx
+    popl    %ecx
+    popl    %ebx
     ret

libc/arch-x86/syscalls/getresuid.S

diff --git a/libc/arch-x86/syscalls/getresuid.S b/libc/arch-x86/syscalls/getresuid.S
index f07b5c5..f489d40 100644
--- a/libc/arch-x86/syscalls/getresuid.S
+++ b/libc/arch-x86/syscalls/getresuid.S
@@ -7,6 +7,12 @@
     .align 4
 
 getresuid:
+    pushl   %ebx
+    pushl   %ecx
+    pushl   %edx
+    mov     16(%esp), %ebx
+    mov     20(%esp), %ecx
+    mov     24(%esp), %edx
     movl    $__NR_getresuid32, %eax
     int     $0x80
     cmpl    $-129, %eax
@@ -17,4 +23,7 @@
     addl    $4, %esp
     orl     $-1, %eax
 1:
+    popl    %edx
+    popl    %ecx
+    popl    %ebx
     ret

libc/include/sys/linux-unistd.h

diff --git a/libc/include/sys/linux-unistd.h b/libc/include/sys/linux-unistd.h
index 8422d7e..12a7ac4 100644
--- a/libc/include/sys/linux-unistd.h
+++ b/libc/include/sys/linux-unistd.h
@@ -17,8 +17,8 @@
 gid_t            getgid (void);
 uid_t            geteuid (void);
 gid_t            getegid (void);
-uid_t            getresuid (void);
-gid_t            getresgid (void);
+uid_t            getresuid (uid_t *ruid, uid_t *euid, uid_t *suid);
+gid_t            getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid);
 pid_t            gettid (void);
 ssize_t          readahead (int, off64_t, size_t);
 int              getgroups (int, gid_t *);

libc/unistd/getcwd.c

diff --git a/libc/unistd/getcwd.c b/libc/unistd/getcwd.c
index 1cf80e9..1172445 100644
--- a/libc/unistd/getcwd.c
+++ b/libc/unistd/getcwd.c
@@ -26,10 +26,15 @@
  * SUCH DAMAGE.
  */
 #include <unistd.h>
+#include <errno.h>
 
 extern int __getcwd(char * buf, size_t size);
 
 char *getcwd(char *buf, size_t size)
 {
+  if (buf == NULL || size == 0) {
+    errno = EINVAL;
+    return NULL;
+  }
   return ( __getcwd(buf, size) < 0 ) ? NULL : buf;
 }