Attachment 6965 Details for Bug 15418 – file.diff

[patch] file.diff

file.diff (text/plain), 1.58 KB, created by cejkar on 1999-12-11 17:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: cejkar

Created: 1999-12-11 17:50:01 UTC

Size: 1.58 KB

patch

obsolete

>--- tput.c.orig	Sat Dec 11 16:34:23 1999
>+++ tput.c	Sat Dec 11 18:11:17 1999
>@@ -47,6 +47,7 @@
> #include <termcap.h>
> #include <stdio.h>
> #include <stdlib.h>
>+#include <string.h>
> #include <unistd.h>
> 
> #undef putchar
>@@ -139,34 +140,40 @@
> 	    "too many arguments (%d) for capability `%s'";
> 	static char erresc[] =
> 	    "unknown %% escape `%c' for capability `%s'";
>+	static char errcap[] =
>+	    "unexpected end of capability `%s'";
> 	char *cp;
> 	int arg_need, arg_rows, arg_cols;
> 
> 	/* Count how many values we need for this capability. */
> 	for (cp = str, arg_need = 0; *cp != '\0'; cp++)
> 		if (*cp == '%')
>-			    switch (*++cp) {
>-			    case 'd':
>-			    case '2':
>-			    case '3':
>-			    case '.':
>-			    case '+':
>-				    arg_need++;
>-				    break;
>-			    case '%':
>-			    case '>':
>-			    case 'i':
>-			    case 'r':
>-			    case 'n':
>-			    case 'B':
>-			    case 'D':
>-				    break;
>-			    default:
>-				/*
>-				 * hpux has lot's of them, but we complain
>-				 */
>-				 warnx(erresc, *cp, cap);
>-			    }
>+			switch (*++cp) {
>+			case 'p':
>+				if (*++cp == '\0') {
>+					warnx(errcap, cap);
>+					cp--;
>+					break;
>+				}
>+				if (*cp >= '1' && *cp <= '9' && *cp > arg_need)
>+					arg_need = *cp - '0';
>+				break;
>+			case '\'':
>+				if (*++cp == '\0') {
>+					warnx(errcap, cap);
>+					cp--;
>+				}
>+				break;
>+			case '\0':
>+				warnx(errcap, cap);
>+				cp--;
>+				break;
>+			default:
>+				if (strchr("%:# 0123456789.doxXs" /* + */
>+				    "cPg{l+-*/m&|^=><AO!~i?te;", *cp) == NULL)
>+					warnx(erresc, *cp, cap);
>+				break;
>+			}
> 
> 	/* And print them. */
> 	switch (arg_need) {

Actions: View | Diff

Attachments on bug 15418: 6965