[Pkg-gnupg-commit] [gnupg2] 27/49: common: Accept the Z-suffix for yymmddThhmmssZ format.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 0e5bd473a07f188615c4fce26b73bb452d689d68
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Sep 19 16:09:05 2017 +0900

    common: Accept the Z-suffix for yymmddThhmmssZ format.
    
    * common/gettime.c (isotime_p): Accept the Z suffix.
    
    --
    
    The intention is use for human interface.
    
    GnuPG-bug-id: 3278
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
    (cherry picked from commit ba8afc4966cca1f6aaf9b2a9bfc3220782306c2b)
---
 common/gettime.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/gettime.c b/common/gettime.c
index 3e1ee55..4ad99f5 100644
--- a/common/gettime.c
+++ b/common/gettime.c
@@ -222,6 +222,8 @@ isotime_p (const char *string)
   for (s++, i=9; i < 15; i++, s++)
     if (!digitp (s))
       return 0;
+  if (*s == 'Z')
+    s++;
   if ( !(!*s || (isascii (*s) && isspace(*s)) || *s == ':' || *s == ','))
     return 0;  /* Wrong delimiter.  */
 
@@ -354,9 +356,10 @@ string2isotime (gnupg_isotime_t atime, const char *string)
 }
 
 
-/* Scan an ISO timestamp and return an Epoch based timestamp.  The only
-   supported format is "yyyymmddThhmmss" delimited by white space, nul, a
-   colon or a comma.  Returns (time_t)(-1) for an invalid string.  */
+/* Scan an ISO timestamp and return an Epoch based timestamp.  The
+   only supported format is "yyyymmddThhmmss[Z]" delimited by white
+   space, nul, a colon or a comma.  Returns (time_t)(-1) for an
+   invalid string.  */
 time_t
 isotime2epoch (const char *string)
 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git