CVS commit: [netbsd-6] src/lib/libterminfo

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Thu Mar 14 15:40:58 UTC 2013

Modified Files:
        src/lib/libterminfo [netbsd-6]: tparm.c

Log Message:
Pull up following revision(s) (requested by roy in ticket #834):
        lib/libterminfo/tparm.c: revision 1.10
Fix %t logic and don't output any %; or %e parts.
Fixes PR lib/47490 thanks to Julien Oster


To generate a diff of this commit:
cvs rdiff -u -r1.7.4.1 -r1.7.4.2 src/lib/libterminfo/tparm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/lib/libterminfo/tparm.c
diff -u src/lib/libterminfo/tparm.c:1.7.4.1 src/lib/libterminfo/tparm.c:1.7.4.2
--- src/lib/libterminfo/tparm.c:1.7.4.1	Tue Dec 11 04:26:26 2012
+++ src/lib/libterminfo/tparm.c	Thu Mar 14 15:40:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tparm.c,v 1.7.4.1 2012/12/11 04:26:26 riz Exp $ */
+/* $NetBSD: tparm.c,v 1.7.4.2 2013/03/14 15:40:58 riz Exp $ */
 
 /*
  * Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: tparm.c,v 1.7.4.1 2012/12/11 04:26:26 riz Exp $");
+__RCSID("$NetBSD: tparm.c,v 1.7.4.2 2013/03/14 15:40:58 riz Exp $");
 
 #include <assert.h>
 #include <ctype.h>
@@ -453,7 +453,7 @@ _ti_tiparm(TERMINAL *term, const char *s
 			break;
 		case 't': /* then */
 			pop(&val, NULL, &stack);
-			if (val != 0) {
+			if (val == 0) {
 				l = 0;
 				for (; *str != '\0'; str++) {
 					if (*str != '%')
@@ -464,10 +464,14 @@ _ti_tiparm(TERMINAL *term, const char *s
 					else if (*str == ';') {
 						if (l > 0)
 							l--;
-						else
+						else {
+							str++;
 							break;
-					} else if (*str == 'e' && l == 0)
+						}
+					} else if (*str == 'e' && l == 0) {
+						str++;
 						break;
+					}
 				}
 			}
 			break;
@@ -482,8 +486,10 @@ _ti_tiparm(TERMINAL *term, const char *s
 				else if (*str == ';') {
 					if (l > 0)
 						l--;
-					else
+					else {
+						str++;
 						break;
+					}
 				}
 			}
 			break;