summaryrefslogtreecommitdiff
path: root/lib/strftime.c
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1999-04-06 14:22:06 +0000
committerJim Meyering <jim@meyering.net>1999-04-06 14:22:06 +0000
commit2af4373a901cfcc0e6f178c2e2a445b07e871429 (patch)
tree8ff4523e52cb9877aa34c0e1f1d70867946c62d9 /lib/strftime.c
parent20203a77e10ac04250f53e623b3f636b8ba4be2f (diff)
downloadcoreutils-2af4373a901cfcc0e6f178c2e2a445b07e871429.tar.xz
Update from master source in libc, removing %f.
Diffstat (limited to 'lib/strftime.c')
-rw-r--r--lib/strftime.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/strftime.c b/lib/strftime.c
index c13612562..fc3d0c79f 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,95,96,97,98 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C Library.
Bugs can be reported to bug-glibc@prep.ai.mit.edu.
@@ -10,8 +10,8 @@
This program 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 General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
@@ -1025,7 +1025,6 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp
add (1, *p = '\t');
break;
- case 'f':
case 'u': /* POSIX.2 extension. */
DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1);
@@ -1220,7 +1219,7 @@ my_strftime (char *s, size_t maxsize, const char *format, const struct tm *tp
}
}
- if (p && i < maxsize)
+ if (p && maxsize != 0)
*p = '\0';
return i;
}