diff options
author | Joseph Myers <joseph@codesourcery.com> | 2015-06-17 20:22:39 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-17 20:22:39 +0000 |
commit | c36213513490412941512daccf447513e442651b (patch) | |
tree | d5be56d7d716470d892ca65d847c73165866a28b /sysdeps/posix | |
parent | abccad04b4172d552dbdae948c0e567ba266ad76 (diff) | |
download | glibc-c36213513490412941512daccf447513e442651b.tar.gz glibc-c36213513490412941512daccf447513e442651b.tar.xz glibc-c36213513490412941512daccf447513e442651b.zip |
Fix nice getpriority, setpriority namespace (bug 18553).
nice (XPG3) calls getpriority and setpriority (in XPG4 but not XPG3, i.e. UX-shaded in XPG4). This patch fixes this by making those functions into weak aliases of __* functions and calling the __* versions as needed. Tested for x86_64 and x86 (testsuite, and that disassembly of installed shared libraries is unchanged by this patch). This completes cleaning up the unsorted linknamespace test XFAILs. [BZ #18553] * resource/getpriority.c (getpriority): Rename to __getpriority and define as weak alias of __getpriority. * resource/setpriority.c (setpriority): Rename to __setpriority and define as weak alias of __setpriority. * sysdeps/mach/hurd/getpriority.c (getpriority): Rename to __getpriority and define as weak alias of __getpriority. * sysdeps/mach/hurd/setpriority.c (setpriority): Rename to __setpriority and define as weak alias of __setpriority. * sysdeps/unix/syscalls.list (getpriority): Use __getpriority as strong name. (setpriority): Use __setpriority as strong name. * sysdeps/unix/sysv/linux/getpriority.c (getpriority): Rename to __getpriority and define as weak alias of __getpriority. * include/sys/resource.h (__getpriority): Declare. Use libc_hidden_proto. (__setpriority): Likewise. (getpriority): Don't use libc_hidden_proto. (setpriority): Likewise. * sysdeps/posix/nice.c (nice): Call __getpriority instead of getpriority. Call __setpriority instead of setpriority. * conform/Makefile (test-xfail-XPG3/unistd.h/linknamespace): Remove variable.
Diffstat (limited to 'sysdeps/posix')
-rw-r--r-- | sysdeps/posix/nice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/posix/nice.c b/sysdeps/posix/nice.c index 67b127348f..42bb99b7e1 100644 --- a/sysdeps/posix/nice.c +++ b/sysdeps/posix/nice.c @@ -31,7 +31,7 @@ nice (int incr) /* -1 is a valid priority, so we use errno to check for an error. */ save = errno; __set_errno (0); - prio = getpriority (PRIO_PROCESS, 0); + prio = __getpriority (PRIO_PROCESS, 0); if (prio == -1) { if (errno != 0) @@ -40,12 +40,12 @@ nice (int incr) __set_errno (save); } - result = setpriority (PRIO_PROCESS, 0, prio + incr); + result = __setpriority (PRIO_PROCESS, 0, prio + incr); if (result == -1) { if (errno == EACCES) errno = EPERM; return -1; } - return getpriority (PRIO_PROCESS, 0); + return __getpriority (PRIO_PROCESS, 0); } |