Deleted Added
full compact
jailp.h (223190) jailp.h (223263)
1/*-
2 * Copyright (c) 2011 James Gritton.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2011 James Gritton.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: projects/jailconf/usr.sbin/jail/jailp.h 223190 2011-06-17 16:21:03Z jamie $
26 * $FreeBSD: projects/jailconf/usr.sbin/jail/jailp.h 223263 2011-06-18 15:23:08Z jamie $
27 */
28
29#include <sys/param.h>
30#include <sys/types.h>
31#include <sys/jail.h>
32#include <sys/queue.h>
33#include <sys/time.h>
34

--- 142 unchanged lines hidden (view full) ---

177 STAILQ_ENTRY(cfdepend) tq[2];
178 struct cfjail *j[2];
179 unsigned flags;
180};
181
182extern void *emalloc(size_t);
183extern void *erealloc(void *, size_t);
184extern char *estrdup(const char *);
27 */
28
29#include <sys/param.h>
30#include <sys/types.h>
31#include <sys/jail.h>
32#include <sys/queue.h>
33#include <sys/time.h>
34

--- 142 unchanged lines hidden (view full) ---

177 STAILQ_ENTRY(cfdepend) tq[2];
178 struct cfjail *j[2];
179 unsigned flags;
180};
181
182extern void *emalloc(size_t);
183extern void *erealloc(void *, size_t);
184extern char *estrdup(const char *);
185extern int create_jail(struct cfjail *j);
185extern void failed(struct cfjail *j);
186extern void jail_note(const struct cfjail *j, const char *fmt, ...);
187extern void jail_warnx(const struct cfjail *j, const char *fmt, ...);
188
189extern int next_command(struct cfjail *j);
190extern int finish_command(struct cfjail *j);
191extern struct cfjail *next_proc(int nonblock);
192

--- 21 unchanged lines hidden (view full) ---

214extern void yyerror(const char *);
215extern int yylex(void);
216extern int yyparse(void);
217
218extern struct cfjails cfjails;
219extern struct cfjails ready;
220extern struct cfjails depend;
221extern const char *cfname;
186extern void failed(struct cfjail *j);
187extern void jail_note(const struct cfjail *j, const char *fmt, ...);
188extern void jail_warnx(const struct cfjail *j, const char *fmt, ...);
189
190extern int next_command(struct cfjail *j);
191extern int finish_command(struct cfjail *j);
192extern struct cfjail *next_proc(int nonblock);
193

--- 21 unchanged lines hidden (view full) ---

215extern void yyerror(const char *);
216extern int yylex(void);
217extern int yyparse(void);
218
219extern struct cfjails cfjails;
220extern struct cfjails ready;
221extern struct cfjails depend;
222extern const char *cfname;
223extern int note_remove;
222extern int paralimit;
223extern int verbose;
224extern int paralimit;
225extern int verbose;