summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--manual/time.texi5
-rw-r--r--time/strptime.c2
3 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a89e02e831..8239b709b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-31  Ulrich Drepper  <drepper@redhat.com>
+
+	* time/strptime.c (strptime_internal): Recognize 'l' format and
+	handle it like 'I' for symmatry with strftime.
+
 2001-08-31  Richard Henderson  <rth@redhat.com>
 
 	* elf/dl-support.c (_dl_cpuclock_offset): Protect with NONAVAIL.
diff --git a/manual/time.texi b/manual/time.texi
index 27060b5358..a128243d4d 100644
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -1480,6 +1480,11 @@ format; e.g. a date passed as @code{"02:1999:9"} is acceptable, even
 though it is ambiguous without context.  As long as the format string
 @var{fmt} matches the input string the function will succeed.
 
+The user has to make sure, though, that the input can be parsed in a
+unambiguous way.  The string @code{"1999112"} can be parsed using the
+format @code{"%Y%m%d"} as 1999-1-12, 1999-11-2, or even 19991-1-2.  It
+is necessary to add appropriate separators to reliably get results.
+
 The format string consists of the same components as the format string
 of the @code{strftime} function.  The only difference is that the flags
 @code{_}, @code{-}, @code{0}, and @code{^} are not allowed.
diff --git a/time/strptime.c b/time/strptime.c
index 88b13f09e6..1f440a5d2f 100644
--- a/time/strptime.c
+++ b/time/strptime.c
@@ -463,6 +463,8 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
 	  tm->tm_hour = val;
 	  have_I = 0;
 	  break;
+	case 'l':
+	  /* Match hour in 12-hour clock.  GNU extension.  */
 	case 'I':
 	  /* Match hour in 12-hour clock.  */
 	  get_number (1, 12, 2);