[packages/cproto.git] / cproto.patch

diff -uNr cproto-4.6/Makefile.in cproto-4.6.new/Makefile.in
--- cproto-4.6/Makefile.in	Sat Jan 24 03:42:00 1998
+++ cproto-4.6.new/Makefile.in	Mon Mar 15 17:59:07 1999
@@ -4,7 +4,7 @@
 # UNIX template-makefile for C prototype generator
 
 THIS = cproto
-RELEASE = 4_6
+RELEASE = 4_6_1
 
 #### Start of system configuration section. ####
 
@@ -21,7 +21,7 @@
 INSTALL_PROGRAM	= @INSTALL_PROGRAM@
 INSTALL_DATA	= @INSTALL_DATA@
 
-DEFINES		=
+DEFINES		= -DMAX_INC_DIR=64 -DMAX_INC_DEPTH=64
 CPPFLAGS	= -I$(srcdir) $(DEFINES) -DHAVE_CONFIG_H @CPPFLAGS@
 CFLAGS		= @CFLAGS@ $(CPPFLAGS)
 LIBS		= @LIBS@ @LEXLIB@
diff -uNr cproto-4.6/cproto.c cproto-4.6.new/cproto.c
--- cproto-4.6/cproto.c	Sat Jan 24 03:42:07 1998
+++ cproto-4.6.new/cproto.c	Mon Mar 15 18:00:01 1999
@@ -2,7 +2,7 @@
  *
  * C function prototype generator and function definition converter
  */
-#define VERSION "4.6"
+#define VERSION "4.6.1"
 
 #include <stdio.h>
 #include <ctype.h>
diff -uNr cproto-4.6/yyerror.c cproto-4.6.new/yyerror.c
--- cproto-4.6/yyerror.c	Sat Apr 13 07:29:18 1996
+++ cproto-4.6.new/yyerror.c	Mon Mar 15 17:58:29 1999
@@ -126,22 +126,16 @@
     if (count < 0) {
 	if (last++ >= 0) {
 	    qsort((char *)vec, (size_t)last, sizeof(vec[0]), compar);
-	    /* limit length of error message */
-	    k = 80 - (strlen(vec[last-1]) + 2);
+
 	    for (j = 0; j < last; j++) {
 		tag = j ? " " : "Expected: ";
-		s = vec[j];
-		if (j != (last - 1)) {
-		    x = strlen(s) + strlen(tag);
-		    if (k <= 0)
-			continue;
-		    else if ((k - x) <= 0)
-			s = "...";
-		    k -= x;
-		}
-		fprintf(stderr, "%s%s", tag, s);
+
+		if (vec[j])
+		    fprintf(stderr, "%s%s", tag, vec[j]);
 	    }
+	    
 	    fprintf(stderr, "\n");
+
 	    while (--last >= 0)
 	    	free(vec[last]);
 	}
Commit	Line	Data
f9f6faef	1	diff -uNr cproto-4.6/Makefile.in cproto-4.6.new/Makefile.in
	2	--- cproto-4.6/Makefile.in Sat Jan 24 03:42:00 1998
	3	+++ cproto-4.6.new/Makefile.in Mon Mar 15 17:59:07 1999
	4	@@ -4,7 +4,7 @@
	5	# UNIX template-makefile for C prototype generator
	6
	7	THIS = cproto
	8	-RELEASE = 4_6
	9	+RELEASE = 4_6_1
	10
	11	#### Start of system configuration section. ####
	12
	13	@@ -21,7 +21,7 @@
	14	INSTALL_PROGRAM = @INSTALL_PROGRAM@
	15	INSTALL_DATA = @INSTALL_DATA@
	16
	17	-DEFINES =
	18	+DEFINES = -DMAX_INC_DIR=64 -DMAX_INC_DEPTH=64
	19	CPPFLAGS = -I$(srcdir) $(DEFINES) -DHAVE_CONFIG_H @CPPFLAGS@
	20	CFLAGS = @CFLAGS@ $(CPPFLAGS)
	21	LIBS = @LIBS@ @LEXLIB@
	22	diff -uNr cproto-4.6/cproto.c cproto-4.6.new/cproto.c
	23	--- cproto-4.6/cproto.c Sat Jan 24 03:42:07 1998
	24	+++ cproto-4.6.new/cproto.c Mon Mar 15 18:00:01 1999
	25	@@ -2,7 +2,7 @@
	26	*
	27	* C function prototype generator and function definition converter
	28	*/
	29	-#define VERSION "4.6"
	30	+#define VERSION "4.6.1"
	31
	32	#include <stdio.h>
	33	#include <ctype.h>
	34	diff -uNr cproto-4.6/yyerror.c cproto-4.6.new/yyerror.c
	35	--- cproto-4.6/yyerror.c Sat Apr 13 07:29:18 1996
	36	+++ cproto-4.6.new/yyerror.c Mon Mar 15 17:58:29 1999
	37	@@ -126,22 +126,16 @@
	38	if (count < 0) {
	39	if (last++ >= 0) {
	40	qsort((char *)vec, (size_t)last, sizeof(vec[0]), compar);
	41	- /* limit length of error message */
	42	- k = 80 - (strlen(vec[last-1]) + 2);
	43	+
	44	for (j = 0; j < last; j++) {
	45	tag = j ? " " : "Expected: ";
	46	- s = vec[j];
	47	- if (j != (last - 1)) {
	48	- x = strlen(s) + strlen(tag);
	49	- if (k <= 0)
	50	- continue;
	51	- else if ((k - x) <= 0)
	52	- s = "...";
	53	- k -= x;
	54	- }
	55	- fprintf(stderr, "%s%s", tag, s);
	56	+
	57	+ if (vec[j])
	58	+ fprintf(stderr, "%s%s", tag, vec[j]);
	59	}
	60	+
	61	fprintf(stderr, "\n");
	62	+
	63	while (--last >= 0)
	64	free(vec[last]);
65	}