d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strptime: add support for %t and %n

Browse Source 
Posix strptime() requires support for %t and %n, which were added
to the illumos port.  Curiously we were skipping white spaces by
default in most other cases making %t meaningless.

We now skip spaces in the case of the %e specifier as strftime(3)
explicitly adds a space for the single digit case.

Reference:
http://pubs.opengroup.org/onlinepubs/009695399/functions/strptime.html

Obtained from:	Illumos (Rev. a11c1571b6942161b0186d0588609448066892c2)
MFC after:	3 weeks
This commit is contained in:
Pedro F. Giffuni 2014-06-18 23:34:48 +00:00
parent b229e4727b
commit cd9dcb0307
1 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lib/libc/stdtime/strptime.c
View File

@ -1,4 +1,6 @@
/*-
* Copyright (c) 2014 Gary Mills
* Copyright 2011, Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 1994 Powerdog Industries. All rights reserved.
*
* Copyright (c) 2011 The FreeBSD Foundation
@ -224,11 +226,6 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
tm->tm_sec = i;
}
if (*buf != 0 &&
isspace_l((unsigned char)*buf, locale))
while (*ptr != 0 &&
!isspace_l((unsigned char)*ptr, locale))
ptr++;
break;
case 'H':
@ -261,11 +258,6 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
tm->tm_hour = i;
if (*buf != 0 &&
isspace_l((unsigned char)*buf, locale))
while (*ptr != 0 &&
!isspace_l((unsigned char)*ptr, locale))
ptr++;
break;
case 'p':
@ -335,11 +327,6 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
if (i > 53)
return (NULL);
if (*buf != 0 &&
isspace_l((unsigned char)*buf, locale))
while (*ptr != 0 &&
!isspace_l((unsigned char)*ptr, locale))
ptr++;
break;
case 'w':
@ -352,18 +339,22 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
tm->tm_wday = i;
if (*buf != 0 &&
isspace_l((unsigned char)*buf, locale))
while (*ptr != 0 &&
!isspace_l((unsigned char)*ptr, locale))
ptr++;
break;
case 'd':
case 'e':
/*
* The %e specifier is explicitly documented as not
* being zero-padded but there is no harm in allowing
* With %e format, our strftime(3) adds a blank space
* before single digits.
*/
if (*buf != 0 &&
isspace_l((unsigned char)*buf, locale))
buf++;
/* FALLTHROUGH */
case 'd':
/*
* The %e specifier was once explicitly documented as
* not being zero-padded but was later changed to
* equivalent to %d. There is no harm in allowing
* such padding.
*
* XXX The %e specifier may gobble one too many
@ -384,11 +375,6 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
tm->tm_mday = i;
if (*buf != 0 &&
isspace_l((unsigned char)*buf, locale))
while (*ptr != 0 &&
!isspace_l((unsigned char)*ptr, locale))
ptr++;
break;
case 'B':
@ -445,11 +431,6 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
tm->tm_mon = i - 1;
if (*buf != 0 &&
isspace_l((unsigned char)*buf, locale))
while (*ptr != 0 &&
!isspace_l((unsigned char)*ptr, locale))
ptr++;
break;
case 's':
@ -498,11 +479,6 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
tm->tm_year = i;
if (*buf != 0 &&
isspace_l((unsigned char)*buf, locale))
while (*ptr != 0 &&
!isspace_l((unsigned char)*ptr, locale))
ptr++;
break;
case 'Z':
@ -559,6 +535,12 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
*GMTp = 1;
}
break;
case 'n':
case 't':
while (isspace_l((unsigned char)*buf, locale))
buf++;
break;
}
}
return ((char *)buf);