automatically generated from GPLed version

diff --git a/src/mktime.c b/src/mktime.c
index d63f57232aa5c2c7049056e879c6ae4b30ea1f7e..a0cbce9a8f1751ca6a960afb6b40ec1e5a991cea 100644 (file)
--- a/src/mktime.c
+++ b/src/mktime.c
@@ -196,7 +196,7 @@ __mktime_internal (tp, convert, offset)
 
   /* The maximum number of probes (calls to CONVERT) should be enough
      to handle any combinations of time zone rule changes, solar time,
-     and leap seconds.  Posix.1 prohibits leap seconds, but some hosts
+     and leap seconds.  POSIX.1 prohibits leap seconds, but some hosts
      have them anyway.  */
   int remaining_probes = 4;
 

diff --git a/src/strftime.c b/src/strftime.c
index 7439244bc4d3f404352820e430b4d8512cfb66fe..50aed8ac76a90da3d455d7a9fb7d7435db18ba9d 100644 (file)
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -885,6 +885,11 @@ my_strftime (s, maxsize, format, tp)
          cpy (buf + sizeof (buf) - bufp, bufp);
          break;
 
+       case 'F':
+         if (modifier != 0)
+           goto bad_format;
+         subfmt = "%Y-%m-%d";
+         goto subformat;
 
        case 'H':
          if (modifier == 'E')
@@ -1031,6 +1036,7 @@ my_strftime (s, maxsize, format, tp)
          add (1, *p = '\t');
          break;
 
+       case 'f':
        case 'u':               /* POSIX.2 extension.  */
          DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1);