about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2009-06-26 21:10:04 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2009-06-26 21:10:04 +0000
commit506c845b25be0fa9aff60fd4b8e0a3e96523ec25 (patch)
tree2fa650c86b66c4d1dd9fe473bf36305748df857f
parent6f78cb51ef245bc0cc4c52302a2c9503f052b7be (diff)
downloadzsh-506c845b25be0fa9aff60fd4b8e0a3e96523ec25.tar.gz
zsh-506c845b25be0fa9aff60fd4b8e0a3e96523ec25.tar.xz
zsh-506c845b25be0fa9aff60fd4b8e0a3e96523ec25.zip
Greg Klanderman: 27057: %e and %f time formats were swapped
-rw-r--r--ChangeLog5
-rw-r--r--Src/utils.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b7aa2f8ad..1b25b778e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-06-26  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* Greg Klanderman: 27057: Src/utils.c: %e and %f time formats
+	were swapped.
+
 	* Frank Terbeck: users/14207:
 	Functions/VCS_Info/Backends/VCS_INFO_get_data_git: make
 	variable local.
@@ -11857,5 +11860,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4717 $
+* $Revision: 1.4718 $
 *****************************************************
diff --git a/Src/utils.c b/Src/utils.c
index 687a396fa..510a02b65 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -2489,10 +2489,10 @@ ztrftime(char *buf, int bufsize, char *fmt, struct tm *tm)
 		    *buf++ = '0' + tm->tm_mday / 10;
 		*buf++ = '0' + tm->tm_mday % 10;
 		break;
-	    case 'e':
+	    case 'f':
 		strip = 1;
 		/* FALLTHROUGH */
-	    case 'f':
+	    case 'e':
 		if (tm->tm_mday > 9)
 		    *buf++ = '0' + tm->tm_mday / 10;
 		else if (!strip)