Re: [PATCH][BZ #15346] Allow leading and trailing spaces in getdate

[Siddhesh Poyarekar <siddhesh at redhat dot com>]

On Mon, Apr 08, 2013 at 03:29:13PM +0200, OndÅej BÃlka wrote:
> Could be simplified, see below.
> 

Thanks, here's v2 then.

Siddhesh

	[BZ #15346]
	* time/getdate.c: Include ctype.h and alloca.h.
	(__getdate_r): Trim leading and trailing spaces of input.
	* time/tst-getdate.c (tests): Add tests with leading and
	trailing spaces.

diff --git a/time/getdate.c b/time/getdate.c
index 637dd18..31673a4 100644
--- a/time/getdate.c
+++ b/time/getdate.c
@@ -25,6 +25,8 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#include <ctype.h>
+#include <alloca.h>
 
 #define TM_YEAR_BASE 1900
 
@@ -135,6 +137,39 @@ __getdate_r (const char *string, struct tm *tp)
   /* No threads reading this stream.  */
   __fsetlocking (fp, FSETLOCKING_BYCALLER);
 
+  size_t inlen = strlen (string);
+  int i = 0;
+  bool free_instr = false;
+
+  /* Skip leading spaces.  */
+  while (string[i] && isspace (string[i]))
+    i++;
+
+  /* Skip trailing spaces.  */
+  while (inlen > i && isspace (string[inlen - 1]))
+    inlen--;
+
+  inlen -= i;
+
+  char *instr;
+  if (__libc_use_alloca (inlen + 1))
+    {
+      instr = alloca (inlen + 1);
+    }
+  else
+    {
+      instr = malloc (inlen + 1);
+      if (instr == NULL)
+	{
+	  fclose (fp);
+	  return 6;
+	}
+      free_instr = true;
+    }
+
+  memcpy (instr, string + i, inlen);
+  instr[inlen] = '\0';
+
   line = NULL;
   len = 0;
   do
@@ -153,12 +188,15 @@ __getdate_r (const char *string, struct tm *tp)
       tp->tm_isdst = -1;
       tp->tm_gmtoff = 0;
       tp->tm_zone = NULL;
-      result = strptime (string, line, tp);
+      result = strptime (instr, line, tp);
       if (result && *result == '\0')
 	break;
     }
   while (!feof_unlocked (fp));
 
+  if (free_instr)
+    free (instr);
+
   /* Free the buffer.  */
   free (line);
 
diff --git a/time/tst-getdate.c b/time/tst-getdate.c
index 7604e83..dc8ecf4 100644
--- a/time/tst-getdate.c
+++ b/time/tst-getdate.c
@@ -31,6 +31,10 @@ static const struct
 } tests [] =
 {
   {"21:01:10 1999-1-31", "Universal", 0, {10, 1, 21, 31, 0, 99, 0, 0, 0}},
+  {"21:01:10    1999-1-31", "Universal", 0, {10, 1, 21, 31, 0, 99, 0, 0, 0}},
+  {"   21:01:10 1999-1-31", "Universal", 0, {10, 1, 21, 31, 0, 99, 0, 0, 0}},
+  {"21:01:10 1999-1-31   ", "Universal", 0, {10, 1, 21, 31, 0, 99, 0, 0, 0}},
+  {"    21:01:10 1999-1-31   ", "Universal", 0, {10, 1, 21, 31, 0, 99, 0, 0, 0}},
   {"21:01:10 1999-2-28", "Universal", 0, {10, 1, 21, 28, 1, 99, 0, 0, 0}},
   {"16:30:46 2000-2-29", "Universal", 0, {46, 30,16, 29, 1, 100, 0, 0, 0}},
   {"01-08-2000 05:06:07", "Europe/Berlin", 0, {7, 6, 5, 1, 7, 100, 0, 0, 0}}