Update.

	* locale/programs/locale-spec.c (locale_special): Take care of
	possible trigraph sequence.
	Patch by Zack Weinberg <zack@rabi.columbia.edu>.

4 files changed, 14 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 78fc7cce87..e131f77af8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-01-27  Ulrich Drepper  <drepper@cygnus.com>
 
+	* locale/programs/locale-spec.c (locale_special): Take care of
+	possible trigraph sequence.
+	Patch by Zack Weinberg <zack@rabi.columbia.edu>.
+
 	* time/strptime.c (strptime_internal, case 's'): Initialize secs
 	to zero.  Patch by Bruce Elliott <bde@nwlink.com>.
 
diff --git a/FAQ.in b/FAQ.in
index db5bd1d373..6112aa02bb 100644
--- a/FAQ.in
+++ b/FAQ.in
@@ -1046,7 +1046,8 @@ siginterrupt().
 
 {AJ} glibc 2.1 has special string functions that are faster than the normal
 library functions.  Some of the functions are additionally implemented as
-inline functions and others as macros.
+inline functions and others as macros.  This might lead to problems with
+existing codes but it is explicitly allowed by ISO C.
 
 The optimized string functions are only used when compiling with
 optimizations (-O1 or higher).  The behavior can be changed with two feature
diff --git a/locale/programs/locale-spec.c b/locale/programs/locale-spec.c
index 9c432e3ead..16272e8880 100644
--- a/locale/programs/locale-spec.c
+++ b/locale/programs/locale-spec.c
@@ -1,5 +1,5 @@
 /* Handle special requests.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
 
@@ -80,7 +80,7 @@ locale_special (const char *name, int show_category_name,
 		      if (ch != EOF)
 			putchar (ch);
 		      else
-			fputs ("<???>", stdout);
+			fputs ("<???\>", stdout);
 		    }
 
 		  putchar ('"');
diff --git a/manual/time.texi b/manual/time.texi
index 1907819407..ea2b0a2f9c 100644
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -1331,12 +1331,12 @@ matched to the format string the function stops.  The remainder of the
 format and input strings are not processed.
 
 The return value of the function is a pointer to the first character not
-processed in this function call.  In the case of an error the return
-value points to the first character not matched.  In case the input
-string contains more than required by the format string the return value
-points right after the last consumed input character.  In case the whole
-input string is consumed the return value points to the NUL byte at the
-end of the string.
+processed in this function call.  In case the input string contains more
+characters than required by the format string the return value points
+right after the last consumed input character.  In case the whole input
+string is consumed the return value points to the NUL byte at the end of
+the string.  If @code{strptime} fails to match all of the format string
+and therefore an error occurred the function returns @code{NULL}.
 @end deftypefun
 
 The specification of the function in the XPG standard is rather vague.