Browse Source

getpgrp: fix fallback handling

The test for generating a stub for getpgrp was wrong and would
result in duplicate symbols when building without __NR_getpgrp,
but with __NR_getpgid and __NR_getpid.

A closer look at the getpgrp implementation using getpgid showed
that getpid was being called to pass the current pid to getpgid.
This is unnecessary because passing 0 to getpgid returns the
pgid of the current process.

This patch cleans up the getpgrp implementation and the stub test.

Signed-off-by: Mark Salter <msalter@redhat.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Mark Salter 12 years ago
parent
commit
9f096becc4
2 changed files with 3 additions and 4 deletions
  1. 2 3
      libc/sysdeps/linux/common/getpgrp.c
  2. 1 1
      libc/sysdeps/linux/common/stubs.c

+ 2 - 3
libc/sysdeps/linux/common/getpgrp.c

@@ -13,10 +13,9 @@
 #ifdef __NR_getpgrp
 /* According to the manpage the POSIX.1 version is favoured */
 _syscall_noerr0(pid_t, getpgrp)
-#elif defined __NR_getpgid && (defined __NR_getpid || defined __NR_getxpid)
-/* IA64 doesn't have a getpgrp syscall */
+#elif defined __NR_getpgid
 pid_t getpgrp(void)
 {
-	return getpgid(getpid());
+	return getpgid(0);
 }
 #endif

+ 1 - 1
libc/sysdeps/linux/common/stubs.c

@@ -150,7 +150,7 @@ make_stub(get_kernel_syms)
 make_stub(getpeername)
 #endif
 
-#if !defined(__NR_getpgrp) && (defined(__NR_getpgid) && (defined(__NR_getpid) || defined(__NR_getxpid)))
+#if !defined __NR_getpgrp && !defined __NR_getpgid
 make_stub(getpgrp)
 #endif