about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2016-05-10 14:56:49 +0000
committerJoseph Myers <joseph@codesourcery.com>2016-05-10 14:56:49 +0000
commitb9eca49e378d183ddf418f5deae1f389cd31dc28 (patch)
tree616ed28e2d02f4cb7b0ab24300a0fa9bd3952fd2
parent4efdc6d956f4ba40f27356e6fc54e40527de63fe (diff)
downloadglibc-b9eca49e378d183ddf418f5deae1f389cd31dc28.tar.gz
glibc-b9eca49e378d183ddf418f5deae1f389cd31dc28.tar.xz
glibc-b9eca49e378d183ddf418f5deae1f389cd31dc28.zip
Declare cuserid in unistd.h for UNIX98 and before (bug 20043).
For UNIX98 and older X/Open standards, unistd.h should have a
declaration of the legacy cuserid function, but such a declaration is
missing.  This patch adds that missing declaration.

Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).

	[BZ #20043]
	* posix/unistd.h [__USE_XOPEN && !__USE_XOPEN2K] (cuserid): New
	prototype.
-rw-r--r--ChangeLog6
-rw-r--r--posix/unistd.h8
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 516be8a96c..55319d8848 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-05-10  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #20043]
+	* posix/unistd.h [__USE_XOPEN && !__USE_XOPEN2K] (cuserid): New
+	prototype.
+
 2016-05-10  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #20017]
diff --git a/posix/unistd.h b/posix/unistd.h
index 405638ce79..4722f7fc5c 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -1138,11 +1138,15 @@ extern void swab (const void *__restrict __from, void *__restrict __to,
 #endif
 
 
-/* The Single Unix specification demands this prototype to be here.
-   It is also found in <stdio.h>.  */
+/* Prior to Issue 6, the Single Unix Specification required these
+   prototypes to appear in this header.  They are also found in
+   <stdio.h>.  */
 #if defined __USE_XOPEN && !defined __USE_XOPEN2K
 /* Return the name of the controlling terminal.  */
 extern char *ctermid (char *__s) __THROW;
+
+/* Return the name of the current user.  */
+extern char *cuserid (char *__s);
 #endif