[Midnightbsd-cvs] src [7117] trunk/usr.sbin/jail: add jail support

[laffer1 at midnightbsd.org]

Revision: 7117
          http://svnweb.midnightbsd.org/src/?rev=7117
Author:   laffer1
Date:     2015-07-21 11:38:55 -0400 (Tue, 21 Jul 2015)
Log Message:
-----------
add jail support

Modified Paths:
--------------
    trunk/usr.sbin/jail/config.c
    trunk/usr.sbin/jail/jaillex.l
    trunk/usr.sbin/jail/jailp.h

Modified: trunk/usr.sbin/jail/config.c
===================================================================
--- trunk/usr.sbin/jail/config.c	2015-07-21 14:31:05 UTC (rev 7116)
+++ trunk/usr.sbin/jail/config.c	2015-07-21 15:38:55 UTC (rev 7117)
@@ -51,6 +51,7 @@
 
 extern FILE *yyin;
 extern int yynerrs;
+extern int yyparse(void);
 
 struct cfjails cfjails = TAILQ_HEAD_INITIALIZER(cfjails);
 

Modified: trunk/usr.sbin/jail/jaillex.l
===================================================================
--- trunk/usr.sbin/jail/jaillex.l	2015-07-21 14:31:05 UTC (rev 7116)
+++ trunk/usr.sbin/jail/jaillex.l	2015-07-21 15:38:55 UTC (rev 7117)
@@ -36,9 +36,6 @@
 #include "jailp.h"
 #include "y.tab.h"
 
-#define YY_NO_INPUT
-#define YY_NO_UNPUT
-
 extern int yynerrs;
 
 static ssize_t text2lval(size_t triml, size_t trimr, int tovar);
@@ -45,8 +42,13 @@
 
 static int instr;
 static int lineno = 1;
+
+#define YY_DECL int yylex(void)
 %}
 
+%option noinput
+%option nounput
+
 %start _ DQ
 
 %%

Modified: trunk/usr.sbin/jail/jailp.h
===================================================================
--- trunk/usr.sbin/jail/jailp.h	2015-07-21 14:31:05 UTC (rev 7116)
+++ trunk/usr.sbin/jail/jailp.h	2015-07-21 15:38:55 UTC (rev 7117)
@@ -222,7 +222,6 @@
 
 extern void yyerror(const char *);
 extern int yylex(void);
-extern int yyparse(void);
 
 extern struct cfjails cfjails;
 extern struct cfjails ready;