This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH v1.2][BZ #14888] Use ISSPACE consistently in strptime
- From: Siddhesh Poyarekar <siddhesh at redhat dot com>
- To: "Joseph S. Myers" <joseph at codesourcery dot com>
- Cc: libc-alpha at sourceware dot org
- Date: Mon, 22 Apr 2013 17:31:12 +0530
- Subject: [PATCH v1.2][BZ #14888] Use ISSPACE consistently in strptime
- References: <20130415125316 dot GI14422 at spoyarek dot pnq dot redhat dot com> <Pine dot LNX dot 4 dot 64 dot 1304191649490 dot 21258 at digraph dot polyomino dot org dot uk> <20130422095706 dot GB16329 at spoyarek dot pnq dot redhat dot com>
Sorry, I had a silly typo in the test case where I reported failure in
both cases. I fixed it and forgot to update the patch. Here it is
now.
Siddhesh
[BZ #14888]
* time/Makefile (tests): Add tst-strptime-whitespace.
* time/strptime_l.c (get_number): Use ISSPACE.
(__strptime_internal): Likewise.
* time/tst-strptime-whitespace.c: New test case.
diff --git a/time/Makefile b/time/Makefile
index a230268..7f4a7fc 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 89daffa..1f2e8b6 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 0000000..d2ceca3
--- /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"