about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2009-03-03 05:22:57 +0000
committerBart Schaefer <barts@users.sourceforge.net>2009-03-03 05:22:57 +0000
commitdaa22bc46bed0a23afad8895bb2b89e7455a0a40 (patch)
treeaeb7bdba24d67cf0b21eb2f21145b46b3066f930
parent4dbe63360d153a5594c676d5f68db36c1e976a40 (diff)
downloadzsh-daa22bc46bed0a23afad8895bb2b89e7455a0a40.tar.gz
zsh-daa22bc46bed0a23afad8895bb2b89e7455a0a40.tar.xz
zsh-daa22bc46bed0a23afad8895bb2b89e7455a0a40.zip
26665: Src/utils.c: fix one incorrect test in 26614.
-rw-r--r--ChangeLog6
-rw-r--r--Src/utils.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b0f1242f..e463ff365 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-02  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 26665: Src/utils.c: fix one incorrect test in 26614.
+
 2009-03-02  Peter Stephenson  <pws@csr.com>
 
 	* Lionel Flandrin: 26625: Src/utils.c: inopportune interrupt
@@ -11290,5 +11294,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4589 $                         
+* $Revision: 1.4590 $                         
 *****************************************************
diff --git a/Src/utils.c b/Src/utils.c
index 3696571bb..fbe1eb223 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -2460,7 +2460,7 @@ ztrftime(char *buf, int bufsize, char *fmt, struct tm *tm)
 		return -1;
 	    switch (*fmt++) {
 	    case 'd':
-		if (strip || tm->tm_mday > 9)
+		if (tm->tm_mday > 9 || !strip)
 		    *buf++ = '0' + tm->tm_mday / 10;
 		*buf++ = '0' + tm->tm_mday % 10;
 		break;
@@ -3090,6 +3090,7 @@ inittyptab(void)
     for (t0 = 0240; t0 != 0400; t0++)
 	typtab[t0] = IALPHA | IALNUM | IIDENT | IUSER | IWORD;
 #endif
+    /* typtab['.'] |= IIDENT; */ /* Allow '.' in variable names - broken */
     typtab['_'] = IIDENT | IUSER;
     typtab['-'] = typtab['.'] = IUSER;
     typtab[' '] |= IBLANK | INBLANK;