diff options
Diffstat (limited to 'time')
| -rw-r--r-- | time/Makefile | 2 | ||||
| -rw-r--r-- | time/strptime_l.c | 4 | ||||
| -rw-r--r-- | time/tst-strptime-whitespace.c | 43 |
3 files changed, 46 insertions, 3 deletions
diff --git a/time/Makefile b/time/Makefile index a230268e0c..7f4a7fc6a8 100644 --- a/time/Makefile +++ b/time/Makefile @@ -35,7 +35,7 @@ aux := era alt_digit lc-time-cleanup tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \ tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \ tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \ - tst-strptime3 bug-getdate1 + tst-strptime3 bug-getdate1 tst-strptime-whitespace include ../Rules diff --git a/time/strptime_l.c b/time/strptime_l.c index 89daffaa05..1f2e8b622f 100644 --- a/time/strptime_l.c +++ b/time/strptime_l.c @@ -72,7 +72,7 @@ localtime_r (t, tp) do { \ int __n = n; \ val = 0; \ - while (*rp == ' ') \ + while (ISSPACE (*rp)) \ ++rp; \ if (*rp < '0' || *rp > '9') \ return NULL; \ @@ -752,7 +752,7 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM) also specified. */ { val = 0; - while (*rp == ' ') + while (ISSPACE (*rp)) ++rp; if (*rp != '+' && *rp != '-') return NULL; diff --git a/time/tst-strptime-whitespace.c b/time/tst-strptime-whitespace.c new file mode 100644 index 0000000000..d2ceca35d2 --- /dev/null +++ b/time/tst-strptime-whitespace.c @@ -0,0 +1,43 @@ +/* Verify that strptime accepts arbitrary whitespace between tokens. + + Copyright (C) 2013 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#define _XOPEN_SOURCE +#include <time.h> +#include <stdio.h> +#include <string.h> + +int +do_test (void) +{ + struct tm t; + const char *in = "Tuesday \t 22 \t July\t1942"; + + char *r = strptime (in, "%A%d %b%Y", &t); + + if (r == NULL || r != in + strlen (in)) + { + printf ("strptime failed\n"); + return 1; + } + + return 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |