This commit was generated by cvs2svn to compensate for changes in r145510,

which included commits to RCS files with non-trunk default branches.

4 files changed, 37 insertions, 32 deletions

diff --git a/contrib/ipfilter/iplang/.cvsignore b/contrib/ipfilter/iplang/.cvsignore
new file mode 100644
index 0000000..68b5b4e
--- /dev/null
+++ b/contrib/ipfilter/iplang/.cvsignore
@@ -0,0 +1,9 @@
+y.tab.h
+y.output
+lex.yy.c
+y.tab.c
+y.tab.o
+lex.yy.o
+iplang_y.output
+iplang_y.tab.c
+iplang_y.tab.h
diff --git a/contrib/ipfilter/iplang/Makefile b/contrib/ipfilter/iplang/Makefile
index f97bf19..5b53e9a 100644
--- a/contrib/ipfilter/iplang/Makefile
+++ b/contrib/ipfilter/iplang/Makefile
@@ -1,36 +1,31 @@
 #
-# Redistribution and use in source and binary forms are permitted
-# provided that this notice is preserved and due credit is given
-# to the original author and the contributors.
+# See the IPFILTER.LICENCE file for details on licencing.
 #
 #CC=gcc -Wuninitialized -Wstrict-prototypes -Werror -O
 CFLAGS=-I..
 
-all: $(DESTDIR)/y.tab.o $(DESTDIR)/lex.yy.o
+all: $(DESTDIR)/iplang_y.o $(DESTDIR)/iplang_l.o
 
-$(DESTDIR)/y.tab.o: $(DESTDIR)/y.tab.c
-	$(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/y.tab.c -o $@
+$(DESTDIR)/iplang_y.o: $(DESTDIR)/iplang_y.c
+	$(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/iplang_y.c -o $@
 
-$(DESTDIR)/$(OBJ)/y.tab.o: $(DESTDIR)/y.tab.c
-	$(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/y.tab.c -o $@
+$(DESTDIR)/iplang_l.o: $(DESTDIR)/iplang_l.c
+	$(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/iplang_l.c -o $@
 
-$(DESTDIR)/lex.yy.o: $(DESTDIR)/lex.yy.c
-	$(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/lex.yy.c -o $@
+iplang_y.o: iplang_y.c
+	$(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c $< -o $@
 
-y.tab.o: y.tab.c
-	$(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c y.tab.c -o $@
+iplang_l.o: iplang_l.c
+	$(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c $< -o $@
 
-lex.yy.o: lex.yy.c
-	$(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c lex.yy.c -o $@
-
-$(DESTDIR)/lex.yy.c: iplang_l.l $(DESTDIR)/y.tab.h
+$(DESTDIR)/iplang_l.c: iplang_l.l $(DESTDIR)/iplang_y.h
 	lex iplang_l.l
-	mv lex.yy.c $(DESTDIR)
+	mv lex.yy.c $(DESTDIR)/iplang_l.c
 
-$(DESTDIR)/y.tab.c $(DESTDIR)/y.tab.h: iplang_y.y
+$(DESTDIR)/iplang_y.c $(DESTDIR)/iplang_y.h: iplang_y.y
 	yacc -d iplang_y.y
-	mv y.tab.c $(DESTDIR)
-	mv y.tab.h $(DESTDIR)
+	mv y.tab.c $(DESTDIR)/iplang_y.c
+	mv y.tab.h $(DESTDIR)/iplang_y.h
 
 clean:
 	/bin/rm -f *.o lex.yy.c y.tab.c y.tab.h
diff --git a/contrib/ipfilter/iplang/iplang.h b/contrib/ipfilter/iplang/iplang.h
index f36a384..675897b 100644
--- a/contrib/ipfilter/iplang/iplang.h
+++ b/contrib/ipfilter/iplang/iplang.h
@@ -1,3 +1,5 @@
+/*	$NetBSD$	*/
+
 /*
  * Copyright (C) 1997-1998 by Darren Reed.
  *
diff --git a/contrib/ipfilter/iplang/iplang_l.l b/contrib/ipfilter/iplang/iplang_l.l
index cc31781..0a97ec9 100644
--- a/contrib/ipfilter/iplang/iplang_l.l
+++ b/contrib/ipfilter/iplang/iplang_l.l
@@ -1,12 +1,12 @@
+/*	$NetBSD$	*/
+
 %{
 /*
  * Copyright (C) 1997-1998 by Darren Reed.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and due credit is given
- * to the original author and the contributors.
+ * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: iplang_l.l,v 2.2.2.1 2003/07/28 01:15:59 darrenr Exp $
+ * Id: iplang_l.l,v 2.8 2003/07/28 01:15:31 darrenr Exp
  */
 #include <stdio.h>
 #include <string.h>
@@ -17,8 +17,7 @@
 #include <sys/types.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
-#include "y.tab.h"
-#include "ip_compat.h"
+#include "iplang_y.h"
 #include "ipf.h"
 
 #ifndef	__P
@@ -43,13 +42,13 @@ int	save_token __P((void));
 void	swallow __P((void));
 int	yylex __P((void));
 
-struct	wordtab	{
+struct	lwordtab	{
 	char	*word;
 	int	state;
 	int	next;
 };
 
-struct	wordtab	words[] = {
+struct	lwordtab	words[] = {
 	{ "interface",	IL_INTERFACE,		-1 },
 	{ "iface",	IL_INTERFACE,		-1 },
 	{ "name",	IL_IFNAME,		IL_TOKEN },
@@ -217,7 +216,7 @@ void pop_proto()
 int save_token()
 {
 
-	yylval.str = strdup(yytext);
+	yylval.str = strdup((char *)yytext);
 	return IL_TOKEN;
 }
 
@@ -225,7 +224,7 @@ int save_token()
 int next_item(nstate)
 int nstate;
 {
-	struct	wordtab	*wt;
+	struct	lwordtab	*wt;
 
 	if (opts & OPT_DEBUG)
 		printf("text=[%s] id=%d next=%d\n", yytext, nstate, next);
@@ -236,13 +235,13 @@ int nstate;
 	token++;
 
 	for (wt = words; wt->word; wt++)
-		if (!strcasecmp(wt->word, yytext))
+		if (!strcasecmp(wt->word, (char *)yytext))
 			return next_state(wt->state, wt->next);
 	if (opts & OPT_DEBUG)
 		printf("unknown keyword=[%s]\n", yytext);
 	next = -1;
 	if (nstate == IL_NUMBER)
-		yylval.num = atoi(yytext);
+		yylval.num = atoi((char *)yytext);
 	token++;
 	return nstate;
 }