about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--manual/users.texi5
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a83383ee06..d57c023ac1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2014-11-21  Alexandre Oliva <aoliva@redhat.com>
 
+	* manual/users.texi (cuserid): Fix MT-Safety note for the case
+	of not passing it a buffer.
+	Reported by Peng Haitao.
+
+2014-11-21  Alexandre Oliva <aoliva@redhat.com>
+
 	* manual/Makefile ($(objpfx)stamp-summary): Require
 	check-safety.sh to pass.
 	* manual/check-safety.sh: Wish for verification that every
diff --git a/manual/users.texi b/manual/users.texi
index a14a25664e..e8f0f3bdf3 100644
--- a/manual/users.texi
+++ b/manual/users.texi
@@ -927,8 +927,9 @@ this function or to @code{cuserid}.
 @comment stdio.h
 @comment POSIX.1
 @deftypefun {char *} cuserid (char *@var{string})
-@safety{@prelim{}@mtsafe{@mtslocale{}}@asunsafe{@ascudlopen{} @ascuplugin{} @ascuheap{} @asulock{}}@acunsafe{@acucorrupt{} @aculock{} @acsfd{} @acsmem{}}}
-@c cuserid @mtslocale @ascudlopen @ascuplugin @ascuheap @asulock @acucorrupt @aculock @acsfd @acsmem
+@safety{@prelim{}@mtunsafe{@mtasurace{:cuserid/!string} @mtslocale{}}@asunsafe{@ascudlopen{} @ascuplugin{} @ascuheap{} @asulock{}}@acunsafe{@acucorrupt{} @aculock{} @acsfd{} @acsmem{}}}
+@c cuserid @mtasurace:cuserid/!string @mtslocale @ascudlopen @ascuplugin @ascuheap @asulock @acucorrupt @aculock @acsfd @acsmem
+@c   if string is NULL, cuserid will overwrite and return a static buffer
 @c  geteuid dup ok
 @c  getpwuid_r dup @mtslocale @ascudlopen @ascuplugin @ascuheap @asulock @acucorrupt @aculock @acsfd @acsmem
 @c  strncpy dup ok