X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1d11e1683d85e56f4245485f1f93c483dfe4d56e..00e5005064eda277a53357efedd85bc7d57675ed:/package/busybox/patches/920-awx.patch

diff --git a/package/busybox/patches/920-awx.patch b/package/busybox/patches/920-awx.patch
index c9c653bb6..2abab323e 100644
--- a/package/busybox/patches/920-awx.patch
+++ b/package/busybox/patches/920-awx.patch
@@ -1,6 +1,7 @@
-diff -purN bb.old/editors/awk.c bb.dev/editors/awk.c
---- bb.old/editors/awk.c	2007-03-06 19:38:07.278092000 +0100
-+++ bb.dev/editors/awk.c	2007-03-11 05:14:11.776304544 +0100
+Index: busybox-1.4.2/editors/awk.c
+===================================================================
+--- busybox-1.4.2.orig/editors/awk.c	2007-06-04 13:21:35.202625056 +0200
++++ busybox-1.4.2/editors/awk.c	2007-06-04 13:21:37.927210856 +0200
 @@ -30,6 +30,11 @@
  /* these flags are static, don't change them when value is changed */
  #define	VF_DONTTOUCH (VF_ARRAY | VF_SPECIAL | VF_WALK | VF_CHILD | VF_DIRTY)
@@ -13,7 +14,7 @@ diff -purN bb.old/editors/awk.c bb.dev/editors/awk.c
  /* Variable */
  typedef struct var_s {
  	unsigned short type;		/* flags */
-@@ -50,10 +55,15 @@ typedef struct chain_s {
+@@ -50,10 +55,15 @@
  	char *programname;
  } chain;
  
@@ -30,7 +31,7 @@ diff -purN bb.old/editors/awk.c bb.dev/editors/awk.c
  } func;
  
  /* I/O stream */
-@@ -1312,7 +1322,8 @@ static void parse_program(char *p)
+@@ -1312,7 +1322,8 @@
  			next_token(TC_FUNCTION);
  			pos++;
  			f = newfunc(t.string);
@@ -40,7 +41,7 @@ diff -purN bb.old/editors/awk.c bb.dev/editors/awk.c
  			f->nargs = 0;
  			while (next_token(TC_VARIABLE | TC_SEQTERM) & TC_VARIABLE) {
  				v = findvar(ahash, t.string);
-@@ -1321,7 +1332,7 @@ static void parse_program(char *p)
+@@ -1321,7 +1332,7 @@
  				if (next_token(TC_COMMA | TC_SEQTERM) & TC_SEQTERM)
  					break;
  			}
@@ -49,7 +50,7 @@ diff -purN bb.old/editors/awk.c bb.dev/editors/awk.c
  			chain_group();
  			clear_array(ahash);
  
-@@ -2260,7 +2271,8 @@ static var *evaluate(node *op, var *res)
+@@ -2260,7 +2271,8 @@
  			break;
  
  		case XC( OC_FUNC ):
@@ -59,7 +60,7 @@ diff -purN bb.old/editors/awk.c bb.dev/editors/awk.c
  				runtime_error(EMSG_UNDEF_FUNC);
  
  			X.v = R.v = nvalloc(op->r.f->nargs+1);
-@@ -2277,7 +2289,11 @@ static var *evaluate(node *op, var *res)
+@@ -2277,7 +2289,11 @@
  			fnargs = X.v;
  
  			L.s = programname;
@@ -72,7 +73,7 @@ diff -purN bb.old/editors/awk.c bb.dev/editors/awk.c
  			programname = L.s;
  
  			nvfree(fnargs);
-@@ -2637,6 +2653,11 @@ static rstream *next_input_file(void)
+@@ -2637,6 +2653,11 @@
  	return &rsm;
  }
  
@@ -84,7 +85,7 @@ diff -purN bb.old/editors/awk.c bb.dev/editors/awk.c
  int awk_main(int argc, char **argv)
  {
  	int i, j, flen;
-@@ -2693,6 +2714,10 @@ int awk_main(int argc, char **argv)
+@@ -2693,6 +2714,10 @@
  		free(s);
  	}
  
@@ -95,10 +96,11 @@ diff -purN bb.old/editors/awk.c bb.dev/editors/awk.c
  	programname = NULL;
  	while((c = getopt(argc, argv, "F:v:f:W:")) != EOF) {
  		switch (c) {
-diff -purN bb.old/editors/awx.c bb.dev/editors/awx.c
---- bb.old/editors/awx.c	1970-01-01 01:00:00.000000000 +0100
-+++ bb.dev/editors/awx.c	2007-03-11 06:25:48.552095336 +0100
-@@ -0,0 +1,521 @@
+Index: busybox-1.4.2/editors/awx.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/editors/awx.c	2007-06-04 13:21:37.928210704 +0200
+@@ -0,0 +1,633 @@
 +/*
 + * awk web extension
 + *
@@ -109,18 +111,18 @@ diff -purN bb.old/editors/awx.c bb.dev/editors/awx.c
 +
 +#include <cgi.h>
 +#include <glob.h>
++#include "awx_parser.h"
 +
 +#define LINE_BUF 2048
 +#define HASH_MAX	1536
 +#define TR_START	"@TR<<"
 +#define TR_END		">>"
 +#define MAX_TR	32
-+#define SSI_START "<%"
-+#define SSI_END "%>"
 +
 +#undef fputs
 +
 +static xhash *lstr = NULL;
++static xhash *formvar = NULL;
 +static int lang_inuse = 0;
 +
 +/* look up a translation symbol from the hash */
@@ -150,10 +152,18 @@ diff -purN bb.old/editors/awx.c bb.dev/editors/awx.c
 +static char *translate_line(char *line)
 +{
 +	char *tok[MAX_TR * 3];
-+	char *l, *p, *p2, *res;
-+	int len = 0, _pos = 0, i;
++	char *l, *p, *p2 = NULL, *res;
++	int len = 0, _pos = 0, i, tr_abort = 0;
++	static char *backlog = NULL;
++
++	if (backlog && line) {
++		backlog = xrealloc(backlog, strlen(backlog) + strlen(line) + 1);
++		sprintf(backlog + strlen(backlog), line);
++		l = backlog;
++	} else {
++		l = line;
++	}
 +
-+	l = line;
 +	while (l != NULL) {
 +		if ((p = strstr(l, TR_START)) == NULL) {
 +			len += strlen((tok[_pos++] = l));
@@ -161,12 +171,15 @@ diff -purN bb.old/editors/awx.c bb.dev/editors/awx.c
 +		}
 +
 +		p2 = strstr(p, TR_END);
-+		if (p2 == NULL)
++		if (p2 == NULL) {
++			p2 = xstrdup(l);
++			tr_abort = 1;
 +			break;
++		}
 +
 +		*p = 0;
-+		*p2 = 0;
 +		len += strlen((tok[_pos++] = l));
++		*p2 = 0;
 +		len += strlen((tok[_pos++] = translate_lookup(p + strlen(TR_START))));
 +
 +		l = p2;
@@ -181,7 +194,13 @@ diff -purN bb.old/editors/awx.c bb.dev/editors/awx.c
 +		strcat(p, tok[i]);
 +		p += strlen(tok[i]);
 +	}
-+
++	if (backlog) {
++		free(backlog);
++		backlog = NULL;
++	}
++	if (tr_abort && p2)
++		backlog = p2;
++	
 +	return res;
 +}
 +
@@ -317,22 +336,24 @@ diff -purN bb.old/editors/awx.c bb.dev/editors/awx.c
 +static void parse_include(char *p)
 +{
 +	uint32_t tclass;
-+	chain initseq;
++	chain *initseq = NULL;
++	chain tmp;
 +	func *f;
-+	var *v, tv;
-+	int has_init = 0;
++	var *v, *tv;
 +
++	tv = nvalloc(1);
++	memset(&tmp, 0, sizeof(tmp));
 +	pos = p;
 +	t.lineno = 1;
-+	memset(&initseq, 0, sizeof(initseq));
 +	while ((tclass = next_token(TC_EOF | TC_OPSEQ |
 +				TC_OPTERM | TC_BEGIN | TC_FUNCDECL)) != TC_EOF) {
 +		if (tclass & TC_OPTERM)
 +			continue;
 +
-+		seq = &initseq;
++		seq = &tmp;
 +		if (tclass & TC_BEGIN) {
-+			has_init = 1;
++			initseq = xzalloc(sizeof(chain));
++			seq = initseq;
 +			chain_group();
 +		} else if (tclass & TC_FUNCDECL) {
 +			next_token(TC_FUNCTION);
@@ -353,58 +374,67 @@ diff -purN bb.old/editors/awx.c bb.dev/editors/awx.c
 +			clear_array(ahash);
 +		}
 +	}
-+	if (has_init)
-+		evaluate(initseq.first, &tv);
++	if (initseq && initseq->first)
++		tv = evaluate(initseq->first, tv);
++	nvfree(tv);
 +}
 +
++
 +/* include an awk file and run its BEGIN{} section */
-+static var *include(var *res, var *args, int nargs)
++static xhash *includes = NULL;
++static void include_file(char *filename)
 +{
-+	static xhash *includes = NULL;
 +	char *s;
 +	var *v;
 +
-+	s = getvar_s(args);
-+	if (!s)
-+		return res;
-+
 +	if (!includes)
 +		includes = hash_init();
 +	
 +	/* find out if the file has been included already */
-+	v = findvar(includes, s);
++	v = findvar(includes, filename);
 +	if (istrue(v))
-+		return res;
++		return;
 +	setvar_s(v, "1");
 +
 +	/* read include file */
-+	s = get_file(s);
++	s = get_file(filename);
 +	if (!s) {
 +		fprintf(stderr, "Could not open file.\n");
-+		return res;
++		return;
 +	}
 +	parse_include(s+1);
 +	free(s);
++}
++
++static var *include(var *res, var *args, int nargs)
++{
++	char *s;
++
++	s = getvar_s(args);
++	if (s && (strlen(s) > 0))
++		include_file(s);
 +
 +	return res;
 +}
 +
-+
-+/* parse and evaluate an awk expression and return the result as string */
-+static char *render_lookup(char *fname, int lnr, char *str)
++/* parse an awk expression */
++static var *parse_awk(char *str, var *tv)
 +{
 +	chain body;
-+	var tv;
++	node *n;
 +
 +	memset(&body, 0, sizeof(body));
-+	zero_out_var(&tv);
 +	pos = str;
 +	seq = &body;
 +	
 +	/* end of expression, assume that there's going to be a free byte
 +	 * at the end of the string that can be used for the ')' */
-+	strcat(str + strlen(str), ")");
-+	return getvar_s(evaluate(parse_expr(TC_SEQTERM), &tv));
++	strcat(str + strlen(str), "}");
++	n = parse_expr(TC_GRPTERM);
++	if (!n)
++		return NULL;
++
++	return evaluate(n, tv);
 +}
 +
 +static inline void print_translate(char *s)
@@ -418,74 +448,102 @@ diff -purN bb.old/editors/awx.c bb.dev/editors/awx.c
 +		free(str);
 +}
 +
-+/* process awk calls in a template line and print the output to stdout */
-+static void render_line(char *fname, int lnr, char *line)
++static void render_element(struct template_cb *tcb, struct template_element *e)
 +{
-+	char *tok[MAX_TR * 3];
-+	char *l, *p, *p2, *res;
-+	int len = 0, _pos = 0, i;
-+
-+	l = line;
-+	while (l != NULL) {
-+		if ((p = strstr(l, SSI_START)) == NULL) {
-+			len += strlen((tok[_pos++] = l));
++	var *v;
++	char *s, *s2;
++	int i;
++	
++	if (!e || !e->var)
++		return;
++	lineno = e->line;
++	switch (e->t) {
++		case T_TEXT:
++			s = malloc(strlen(e->var) + 2);
++			strcpy(s, e->var);
++			print_translate(s);
++			free(s);
 +			break;
-+		}
-+
-+		p2 = strstr(p, SSI_END);
-+		if (p2 == NULL) {
-+			fprintf(stderr, "Parse error in '%s', line '%d', unmatched %s\n", fname, lnr, SSI_END);
++		case T_CODE:
++			s = malloc(strlen(e->var) + 2);
++			strcpy(s, e->var);
++			v = nvalloc(1);
++			s2 = strdup(getvar_s(parse_awk(s, v)));
++			nvfree(v);
++			print_translate(s2);
++			free(s);
++			free(s2);
 +			break;
-+		}
++		case T_IF:
++			s = malloc(strlen(e->var) + 2);
++			strcpy(s, e->var);
++			v = nvalloc(1);
++			i = istrue(parse_awk(s, v));
++			nvfree(v);
++			free(s);
++
++			if (i)
++				execute_template(tcb, e->sub);
++			else if (e->sub2)
++				execute_template(tcb, e->sub2);
++			break;
++		case T_FOR: {
++				v = newvar(e->var);
++				hashwalk_init(v, iamarray(findvar(vhash, e->in)));
++				while (hashwalk_next(v)) {
++					execute_template(tcb, e->sub);
++				}
++				clrvar(v);
++			}
++			break;
++		default:
++			break;
++	}
++}
 +
-+		*p = 0;
-+		*p2 = 0;
-+		
-+		len += strlen((tok[_pos++] = l));
-+		len += strlen((tok[_pos++] = render_lookup(fname, lnr, p + strlen(SSI_START))));
++/* awk method render(), which opens a template file and processes all awk ssi calls */
++static void render_file(char *filename)
++{
++	struct template_cb tcb;
++	struct template_element *e;
++	FILE *f;
++	char *oldprg;
++	int oldlnr;
++	
++	if (!filename)
++		return;
 +
-+		l = p2;
-+		l += strlen(SSI_END);
-+	}
-+	len++;
++	oldlnr = lineno;
++	oldprg = programname;
++	programname = filename;
 +
-+	p = xmalloc(len + 1);
-+	*p = 0;
-+	res = p;
-+	for (i = 0; i < _pos; i++) {
-+		strcat(p, tok[i]);
-+		p += strlen(tok[i]);
-+	}
-+	print_translate(res);
-+	free(res);
++	f = fopen(filename, "r");
++	if (!f)
++		return;
++	
++	memset(&tcb, 0, sizeof(tcb));
++	tcb.handle_element = render_element;
++	e = parse_template(&tcb, f);
++	execute_template(&tcb, e);
++	free_template(&tcb, e);
++	fclose(f);
++	programname = oldprg;
++	lineno = oldlnr;
 +}
 +
-+/* awk method render(), which opens a template file and processes all awk ssi calls */
 +static var *render(var *res, var *args, int nargs)
 +{
 +	char *s;
-+	int lnr = 0;
-+	FILE *f;
-+	char *buf1;
-+			
-+	buf1 = xmalloc(LINE_BUF);
++
 +	s = getvar_s(args);
 +	if (!s)
-+		goto done;
-+
-+	f = fopen(s, "r");
-+	if (!f)
-+		goto done;
++		return res;
 +
-+	while (!feof(f) && (fgets(buf1, LINE_BUF - 1, f) != NULL)) {
-+		render_line(s, ++lnr, buf1);
-+	}
++	render_file(s);
 +	
-+done:
-+	free(buf1);
 +	return res;
 +}
-+
++		
 +/* Call render, but only if this function hasn't been called already */
 +static int layout_rendered = 0;
 +static var *render_layout(var *res, var *args, int nargs)
@@ -507,14 +565,42 @@ diff -purN bb.old/editors/awx.c bb.dev/editors/awx.c
 +	f->nargs = nargs;
 +}
 +
++static void putvar(vartype type, char *name, char *value)
++{
++	if (type != FORM_VAR)
++		return;
++
++	setvar_u(findvar(formvar, name), value);
++}
++
++static char *cgi_getvar(char *name)
++{
++	if (!formvar) {
++		formvar = hash_init();
++		cgi_init(putvar);
++	}
++
++	if (!formvar || !name)
++		return NULL;
++	
++	return getvar_s(findvar(formvar, name));
++}
++
 +/* function call for accessing cgi form variables */
 +static var *getvar(var *res, var *args, int nargs)
 +{
 +	char *s;
++	char *svar;
 +
 +	s = getvar_s(args);
-+	if (s)
-+		setvar_s(res, cgi_param(s) ?: "");
++	if (!s)
++		return res;
++	
++	svar = cgi_getvar(s);
++	if (!svar)
++		return res;
++
++	setvar_u(res, svar);
 +
 +	return res;
 +}
@@ -537,16 +623,61 @@ diff -purN bb.old/editors/awx.c bb.dev/editors/awx.c
 +}
 +
 +
++static int run_awxscript(char *name)
++{
++	var tv, *layout, *action;
++	char *tmp, *s = NULL;
++
++	zero_out_var(&tv);
++	programname = name;
++
++	/* read the main controller source */
++	s = get_file(programname);
++	if (!s) {
++		fprintf(stderr, "Could not open file\n");
++		return 1;
++	}
++	parse_program(s+1);
++	free(s);
++
++
++	/* set some defaults for ACTION and LAYOUT, which will have special meaning */
++	layout = newvar("LAYOUT");
++	setvar_s(layout, "views/layout.ahtml");
++
++	/* run the BEGIN {} block */
++	evaluate(beginseq.first, &tv);
++
++	action = newvar("ACTION");
++	if (!(strlen(getvar_s(action)) > 0)) {
++		tmp = cgi_getvar("action");
++		if (!tmp || (strlen(tmp) <= 0))
++			tmp = strdup("default");
++
++		setvar_p(action, tmp);
++	}
++	
++	/* call the action (precedence: begin block override > cgi parameter > "default") */
++	tmp = xmalloc(strlen(getvar_s(action)) + 7);
++	sprintf(tmp, "handle_%s", getvar_s(action));
++	setvar_s(action, tmp);
++	call(&tv, action, 1);
++	free(tmp);
++
++	/* render the selected layout, will do nothing if render_layout has been called from awk */
++	render_layout(&tv, layout, 1);
++
++	return 0;
++}
++
++
 +/* main awx processing function. called from awk_main() */
 +static int do_awx(int argc, char **argv)
 +{
 +	int ret = -1;
 +	var tv;
-+	char *s = NULL;
-+	var *layout;
-+	var *action;
-+	char *tmp;
-+	int i;
++	int i, c;
++	char **args = argv;
 +	
 +	zero_out_var(&tv);
 +
@@ -563,67 +694,401 @@ diff -purN bb.old/editors/awx.c bb.dev/editors/awx.c
 +		return 0;
 +
 +	/* fill in ARGV array */
-+	programname = argv[1];
 +	setvar_i(V[ARGC], argc + 1);
 +	setari_u(V[ARGV], 0, "awx");
 +	i = 0;
-+	while (*argv)
-+		setari_u(V[ARGV], ++i, *argv++);
++	while (*args)
++		setari_u(V[ARGV], ++i, *args++);
++	
++	while((c = getopt(argc, argv, "i:f:")) != EOF) {
++		switch(c) {
++			case 'i':
++				programname = optarg;
++				include_file(optarg);
++				break;
++			case 'f':
++				ret = 0;
++				programname = optarg;
++				render_file(optarg);
++				goto done;
++		}
++	}
++	argc -= optind;
++	argv += optind;
 +
-+	cgi_init(); 
-+	if (argc < 2) {
++	if (argc < 1) {
 +		fprintf(stderr, "Invalid argument.\n");
 +		goto done;
 +	}
++
++	ret = run_awxscript(*argv);
++
++done:
++	exit(ret);
++}
++
++/* entry point for awx applet */
++int awx_main(int argc, char **argv)
++{
++	is_awx = 1;
++	return awk_main(argc, argv);
++}
++
+Index: busybox-1.4.2/editors/awx_parser.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/editors/awx_parser.h	2007-06-04 13:21:37.928210704 +0200
+@@ -0,0 +1,38 @@
++#ifndef __TEMPLATE_PARSER_H
++#define __TEMPLATE_PARSER_H
++
++enum type {
++	T_TEXT,
++	T_FOR,
++	T_IF,
++	T_CODE
++};
++
++struct template_element;
++struct template_cb;
++
++struct template_cb {
++	void *(*prepare_code)(struct template_element *);
++	void (*handle_element)(struct template_cb *, struct template_element *);
++	void (*free_code)(struct template_element *);
++};
++
++struct template_element {
++	enum type t;
++	char *var;
++	char *in;
++	int line;
++	void *priv;
++	struct template_element *parent;
++	struct template_element *sub;
++	struct template_element *sub2;
++	struct template_element *prev;
++	struct template_element *next;
++};
++
++
++struct template_element *parse_template(struct template_cb *cb, FILE *in);
++void execute_template(struct template_cb *cb, struct template_element *e);
++void free_template(struct template_cb *cb, struct template_element *e);
++
++#endif
+Index: busybox-1.4.2/editors/awx_parser.l
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/editors/awx_parser.l	2007-06-04 13:21:37.929210552 +0200
+@@ -0,0 +1,302 @@
++%{
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++#include "busybox.h"
++#include "awx_parser.h"
++
++enum {
++	S_INIT,
++	S_TEXT,
++	S_CODE,
++	S_IF_START,
++	S_FOR_START,
++	S_FOR_IN,
++	S_END,
++	S_ELSE,
++	S_EOF
++}; 
++int state;
++
++#undef DEBUG
++#ifdef DEBUG
++char *statestr[] = {
++	[S_INIT] = "S_INIT",
++	[S_TEXT] = "S_TEXT",
++	[S_CODE] = "S_CODE",
++	[S_IF_START] = "S_IF_START",
++	[S_FOR_START] = "S_FOR_START",
++	[S_FOR_IN] = "S_FOR_IN",
++	[S_EOF] = "S_EOF"
++};
++
++char *typestr[] = {
++	[T_TEXT] = "T_TEXT",
++	[T_FOR] = "T_FOR",
++	[T_IF] = "T_IF",
++	[T_CODE] = "T_CODE"
++};
++#endif
++
++static struct template_cb *parse_cb;
++static struct template_element *cur, *head;
++static char *textbuf;
++static unsigned int buflen;
++static unsigned int buf_offset;
++static int _lnr = 0;
++
++static void buf_realloc(void)
++{
++	buflen *= 2;
++	textbuf = xrealloc(textbuf, buflen);
++}
++
++static void parse_error(char *str)
++{
++	fprintf(stderr, "Parse error%s%s\n", (str ? ": " : "!"), (str ?: ""));
++	exit(255);
++}
++
++
++static struct template_element *new_template_element(struct template_element *parent)
++{
++	struct template_element *ptr;
 +	
-+	/* read the main controller source */
-+	s = get_file(programname);
-+	if (!s) {
-+		fprintf(stderr, "Could not open file\n");
-+		goto done;
++	ptr = xzalloc(sizeof(struct template_element));
++	ptr->parent = parent;
++	return ptr;
++}
++
++static inline void next_template_element(void)
++{
++	cur->next = new_template_element(cur->parent);
++	cur->next->prev = cur;
++	cur = cur->next;
++}
++
++static void addtext(char *text)
++{
++	while(buf_offset + strlen(text) + 1 > buflen)
++		buf_realloc();
++
++	buf_offset += sprintf(&textbuf[buf_offset], "%s", text);
++}
++
++static void set_state(int newstate)
++{
++	char *ptr;
++
++#ifdef DEBUG
++	static int _rec = 0;
++	fprintf(stderr, "DEBUG(%d): %s => %s: %s\n", _rec, statestr[state], statestr[newstate], textbuf);
++#endif
++	ptr = xstrdup(textbuf);
++	if (state == S_FOR_IN)
++		cur->in = ptr;
++	else
++		cur->var = ptr;
++
++	if (parse_cb && (cur->t == T_CODE) && parse_cb->prepare_code)
++		parse_cb->prepare_code(cur);
++
++	buf_offset = 0;
++	*textbuf = 0;
++
++	switch(newstate) {
++#if 0
++		case S_EOF:
++			if (cur->parent)
++				parse_error();
++			break;
++#endif
++		case S_FOR_START:
++			if (ptr || !cur->prev)
++				next_template_element();
++			cur->t = T_FOR;
++			break;
++		case S_IF_START:
++			if (ptr || !cur->prev)
++				next_template_element();
++			cur->t = T_IF;
++			break;
++		case S_ELSE:
++			cur = cur->parent;
++			if (!cur)
++				parse_error("'@else' without parent element");
++			cur->sub2 = new_template_element(cur);
++			cur = cur->sub2;
++			newstate = S_TEXT;
++			break;
++		case S_END:
++#ifdef DEBUG
++			_rec--;
++#endif
++			cur = cur->parent;
++			if (!cur) 
++				parse_error("'@end' without parent element");
++
++			next_template_element();
++			cur->t = T_TEXT;
++			newstate = S_TEXT;
++			break;
++		case S_TEXT:
++			switch (cur->t) {
++				case T_CODE:
++					next_template_element();
++					break;
++				case T_IF:
++				case T_FOR:
++#ifdef DEBUG
++					_rec++;
++#endif
++					cur->sub = new_template_element(cur);
++					cur = cur->sub;
++					break;
++				default:
++					break;
++			}
++			cur->t = T_TEXT;
++			break;
++		case S_CODE:
++			if (ptr || !cur->prev)
++				next_template_element();
++			cur->t = T_CODE;
++			break;
++		default:
++			break;
 +	}
-+	parse_program(s+1);
-+	free(s);
++	cur->line = _lnr;
++	state = newstate;
++}
 +
-+	/* set some defaults for ACTION and LAYOUT, which will have special meaning */
-+	cgi_process_form();
++%}
 +
-+	action = newvar("ACTION");
-+	setvar_s(action, cgi_param("action") ?: "default");
-+	layout = newvar("LAYOUT");
-+	setvar_s(layout, "views/layout.ahtml");
++%%
++"<%"[ \n\t]*"@if"[ \n\t]+ {
++	if (state == S_TEXT) 
++		set_state(S_IF_START);
++	else
++		REJECT;
++}
 +
-+	/* run the BEGIN {} block */
-+	evaluate(beginseq.first, &tv);
++"<%"[ \n\t]*"@for"[ \n\t]+ {
++	if (state == S_TEXT) 
++		set_state(S_FOR_START);
++	else
++		REJECT;
++}
 +
-+	/* call the action (precedence: begin block override > cgi parameter > "default") */
-+	tmp = xmalloc(strlen(getvar_s(action)) + 7);
-+	sprintf(tmp, "handle_%s", getvar_s(action));
-+	setvar_s(action, tmp);
-+	call(&tv, action, 1);
-+	free(tmp);
++[ \n\t]+"in"[ \n\t]+ {
++	if (state == S_FOR_START)
++		set_state(S_FOR_IN);
++	else
++		REJECT;
++}
 +
-+	/* render the selected layout, will do nothing if render_layout has been called from awk */
-+	render_layout(&tv, layout, 1);
++"<%"[ \n\t]*"@end"[ \n\t]*%> {
++	if (state != S_TEXT)
++		REJECT;
++	set_state(S_END);
++}
 +
-+	ret = 0;
-+done:
-+	cgi_end();
-+	
-+	exit(0);
++"<%"[ \n\t]*"@else"[ \n\t]*%> {
++	if (state != S_TEXT)
++		REJECT;
++	set_state(S_ELSE);
 +}
 +
-+/* entry point for awx applet */
-+int awx_main(int argc, char **argv)
++"<%" {
++	if (state != S_TEXT) 
++		parse_error("'<%' cannot be nested");
++	set_state(S_CODE);
++}
++
++[ \n\t]"%>" {
++	if (state == S_TEXT)
++		REJECT;
++	set_state(S_TEXT);
++}
++
++\n {
++	_lnr++;
++	if (state == S_TEXT)
++		addtext(yytext);
++}
++.	{
++	addtext(yytext);
++}
++
++
++%%
++
++
++void execute_template(struct template_cb *cb, struct template_element *e)
 +{
-+	is_awx = 1;
-+	return awk_main(argc, argv);
++	static int rec = 0;
++
++	while (e) {
++#ifdef DEBUG
++		fprintf(stderr, "DEBUG: execute(%d)\t%s\n", rec, typestr[e->t]);
++#endif
++		rec++;
++		if (cb->handle_element)
++			cb->handle_element(cb, e);
++		rec--;
++		e = e->next;
++	}
++}
++
++int yywrap()
++{
++	set_state(S_EOF);
++	return 1;
 +}
 +
-diff -purN bb.old/editors/Config.in bb.dev/editors/Config.in
---- bb.old/editors/Config.in	2007-01-24 22:34:50.000000000 +0100
-+++ bb.dev/editors/Config.in	2007-03-11 06:19:51.469380160 +0100
-@@ -12,6 +12,13 @@ config AWK
++struct template_element *parse_template(struct template_cb *cb, FILE *in)
++{
++	_lnr = 1;
++	buf_offset = 0;
++	state = S_TEXT;
++	parse_cb = cb;
++	
++	buflen = 4096;
++	textbuf = xzalloc(buflen);
++
++	head = xzalloc(sizeof(struct template_element));
++	head->t = T_TEXT;
++	cur = head;
++
++	yyin = in;
++	yylex();
++
++	return head;
++}
++
++void free_template(struct template_cb *cb, struct template_element *e)
++{
++	struct template_element *next;
++	return;
++	if (!e)
++		return;
++		
++	switch (e->t) {
++		case T_CODE:
++			if (cb->free_code)
++				cb->free_code(e);
++			break;
++		case T_FOR:
++		case T_IF:
++			free_template(cb, e->sub);
++			break;
++		default:
++			break;
++	}
++	if (e->var)
++		free(e->var);
++	if (e->in)
++		free(e->in);
++		
++	next = e->next;
++	free(e);
++	return free_template(cb, next);
++}
+Index: busybox-1.4.2/editors/Config.in
+===================================================================
+--- busybox-1.4.2.orig/editors/Config.in	2007-06-04 13:21:31.486190040 +0200
++++ busybox-1.4.2/editors/Config.in	2007-06-04 13:21:37.929210552 +0200
+@@ -12,6 +12,13 @@
  	  Awk is used as a pattern scanning and processing language.  This is
  	  the BusyBox implementation of that programming language.
  
@@ -637,10 +1102,28 @@ diff -purN bb.old/editors/Config.in bb.dev/editors/Config.in
  config FEATURE_AWK_MATH
  	bool "Enable math functions (requires libm)"
  	default y
-diff -purN bb.old/include/applets.h bb.dev/include/applets.h
---- bb.old/include/applets.h	2007-03-06 19:38:07.355081000 +0100
-+++ bb.dev/include/applets.h	2007-03-07 02:12:24.280681880 +0100
-@@ -60,6 +60,7 @@ USE_ARP(APPLET(arp, _BB_DIR_SBIN, _BB_SU
+Index: busybox-1.4.2/editors/Kbuild
+===================================================================
+--- busybox-1.4.2.orig/editors/Kbuild	2007-06-04 13:21:31.492189128 +0200
++++ busybox-1.4.2/editors/Kbuild	2007-06-04 13:21:37.929210552 +0200
+@@ -10,3 +10,12 @@
+ lib-$(CONFIG_PATCH)     += patch.o
+ lib-$(CONFIG_SED)       += sed.o
+ lib-$(CONFIG_VI)        += vi.o
++lib-$(CONFIG_AWX)		+= awx_parser.o
++
++editors/awx_parser.c: editors/awx_parser.l editors/awx_parser.h
++	@flex $<
++	@mv lex.yy.c $@
++
++editors/awx_parser.o: editors/awx_parser.c FORCE
++	$(call cmd,force_checksrc)
++	$(call if_changed_rule,cc_o_c)
+Index: busybox-1.4.2/include/applets.h
+===================================================================
+--- busybox-1.4.2.orig/include/applets.h	2007-06-04 13:21:36.732392496 +0200
++++ busybox-1.4.2/include/applets.h	2007-06-04 13:21:37.929210552 +0200
+@@ -60,6 +60,7 @@
  USE_ARPING(APPLET(arping, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
  USE_ASH(APPLET_NOUSAGE(ash, ash, _BB_DIR_BIN, _BB_SUID_NEVER))
  USE_AWK(APPLET(awk, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
@@ -648,15 +1131,489 @@ diff -purN bb.old/include/applets.h bb.dev/include/applets.h
  USE_BASENAME(APPLET(basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
  USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER))
  //USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER))
-diff -purN bb.old/Makefile bb.dev/Makefile
---- bb.old/Makefile	2007-03-06 19:38:07.358080000 +0100
-+++ bb.dev/Makefile	2007-03-07 02:28:22.844957960 +0100
-@@ -565,7 +565,7 @@ quiet_cmd_busybox__ ?= LINK    $@
-       cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) $(LDFLAGS) \
-       -o $@ \
-       -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \
--      -Wl,--start-group $(busybox-all) -Wl,--end-group
-+      -Wl,--start-group $(busybox-all) $(EXTRA_LIBS) -Wl,--end-group
- 
- # Generate System.map
- quiet_cmd_sysmap = SYSMAP
+Index: busybox-1.4.2/include/cgi.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/include/cgi.h	2007-06-04 13:21:37.929210552 +0200
+@@ -0,0 +1,8 @@
++#ifndef CGI_H
++#define CGI_H
++
++typedef enum { FORM_VAR, COOKIE_VAR } vartype;
++typedef void (*var_handler) (vartype, char *, char *);
++int cgi_init(var_handler);
++
++#endif
+Index: busybox-1.4.2/libbb/cgi.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.4.2/libbb/cgi.c	2007-06-04 13:21:37.930210400 +0200
+@@ -0,0 +1,457 @@
++/* --------------------------------------------------------------------------
++ * functions for processing cgi form data
++ * Copyright (C) 2007 by Felix Fietkau <nbd@openwrt.org>
++ *
++ * parts taken from the core of haserl.cgi - a poor-man's php for embedded/lightweight environments
++ * $Id: haserl.c,v 1.13 2004/11/10 17:59:35 nangel Exp $ 
++ * Copyright (c) 2003,2004    Nathan Angelacos (nangel@users.sourceforge.net)
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ * -----
++ * The x2c() and unescape_url() routines were taken from  
++ *  http://www.jmarshall.com/easy/cgi/getcgi.c.txt 
++ * 
++ * The comments in that text file state:
++ *
++ ***  Written in 1996 by James Marshall, james@jmarshall.com, except 
++ ***  that the x2c() and unescape_url() routines were lifted directly 
++ ***  from NCSA's sample program util.c, packaged with their HTTPD. 
++ ***     For the latest, see http://www.jmarshall.com/easy/cgi/ 
++ * -----
++ *
++ ------------------------------------------------------------------------- */
++
++#include <stdio.h>
++#include <unistd.h>
++#include <time.h>
++#include <sys/mman.h>
++#include <sys/types.h>
++#include <sys/wait.h>
++#include <sys/stat.h>
++#include <sys/fcntl.h>
++#include <stdlib.h>
++#include <string.h>
++#include <cgi.h>
++
++#ifndef MAX_UPLOAD_KB
++#define MAX_UPLOAD_KB 2048
++#endif
++#define TEMPDIR "/tmp"
++
++static int global_upload_size = 0;
++static int ReadMimeEncodedInput(char *qs);
++static var_handler do_putvar = NULL;
++
++/*
++ * Convert 2 char hex string into char it represents
++ * (from http://www.jmarshall.com/easy/cgi)
++ */
++static char x2c (char *what) {
++	char digit;
++	
++	digit=(what[0] >= 'A' ? ((what[0] & 0xdf) - 'A')+10 : (what[0] - '0'));
++	digit *=16;
++	digit+=(what[1] >= 'A' ? ((what[1] & 0xdf) - 'A')+10 : (what[1] - '0'));
++
++	return digit;
++}
++
++/*
++ * unsescape %xx to the characters they represent 
++ */
++
++static void unescape_url (char *url) {
++	int  i,j;
++
++	for (i=0, j=0; url[j]; ++i, ++j) {
++		if ((url[i] = url[j]) == '%') {
++			url[i] = x2c(&url[j+1]);
++			j+=2;	
++		}
++	}
++	url[i]='\0';
++}
++
++static inline void put_var(vartype type, char *var)
++{
++	char *val;
++	
++	if (!do_putvar)
++		return;
++
++	val = strchr(var, '=');
++	if (!val)
++		return;
++	
++	*val = 0;
++	val++;
++	do_putvar(type, var, val);
++	
++	return;
++}
++
++
++/* CookieVars ()
++ * if HTTP_COOKIE is passed as an environment variable,
++ * attempt to parse its values into environment variables
++ */
++static void CookieVars (void)
++{
++	char *qs;
++	char *token;
++
++	if (getenv("HTTP_COOKIE") != NULL)
++		qs=strdup(getenv("HTTP_COOKIE"));
++	else
++		return;
++	
++	/** split on; to extract name value pairs */
++	token=strtok(qs, ";");
++	while (token) {
++		// skip leading spaces 
++		while ( token[0] == ' ' ) 
++			token++;
++		
++		put_var(COOKIE_VAR, token);
++		
++		token = strtok(NULL, ";");
++	}
++	free (qs);
++}
++
++/* 
++ * Read cgi variables from query string, and put in environment
++ */
++static int ReadCGIQueryString (void) 
++{
++	char *qs;
++	char *token;
++	int i;
++
++	if (getenv("QUERY_STRING") != NULL)
++		qs=strdup(getenv("QUERY_STRING"));
++	else
++		return 0;
++	
++	/* change plusses into spaces */
++	for (i=0; qs[i]; i++ ) { if (qs[i] == '+' ) { qs[i] = ' ';} };
++
++	/** split on & and ; to extract name value pairs */
++	
++	token=strtok(qs, "&;");
++	while (token) {
++		unescape_url(token);
++		put_var(FORM_VAR, token);
++		token=strtok(NULL, "&;");
++	}
++	free(qs);
++
++	return 0;
++}
++
++
++/* 
++ * Read cgi variables from stdin (for POST queries)
++ * (oh... and if its mime-encoded file upload, we save the
++ * file to /tmp; and return the name of the tmp file
++ * the cgi script is responsible for disposing of the tmp file
++ */
++
++static int ReadCGIPOSTValues (void) {
++	char *qs;
++	int content_length;
++	int i;
++	char *token;
++
++
++ 	if (getenv("CONTENT_LENGTH") == NULL) 
++		return(-1);
++	else
++		content_length = atoi(getenv("CONTENT_LENGTH"));
++	
++	/* protect ourselves from 20GB file uploads */
++	if (content_length > MAX_UPLOAD_KB * 1024 ) {
++		/* But we need to finish reading the content */
++	 	while (	fread( &i, sizeof(int), 1, stdin) == 1 );
++		return -1;
++	}
++ 
++ 	if (!(qs=malloc(content_length+1)))
++		return -1;
++
++	/* set the buffer to null, so that a browser messing with less 
++  	   data than content_length won't buffer underrun us */
++	memset(qs, 0 ,content_length+1);
++
++	if ((!fread(qs,content_length,1,stdin) &&
++		(content_length > 0) 
++		&& !feof(stdin))) {
++			
++		free(qs);
++		return -1;
++	}
++
++	if (getenv("CONTENT_TYPE") && (strncasecmp(getenv("CONTENT_TYPE"), "multipart/form-data", 19) == 0)) {
++		/* This is a mime request, we need to go to the mime handler */
++		i=ReadMimeEncodedInput(qs);
++		free(qs);
++			
++		return i;
++	}
++
++	/* change plusses into spaces */
++	for (i=0; qs[i]; i++ ) { if (qs[i] == '+' ) { qs[i] = ' ';} };
++
++	/** split on & and ; to extract name value pairs */
++	token=strtok(qs, "&;");
++	while (token) {
++		unescape_url(token);
++		put_var(FORM_VAR, token);
++		token=strtok(NULL, "&;");
++	}
++	
++	free(qs);
++	
++	return 0;
++}
++
++/*
++ *  LineToStr - Scans char and replaces the first "\n" with a "\0";
++ *  If it finds a "\r", it does that to; (fix DOS brokennes) returns
++ *  the length of the string;
++ */
++static int LineToStr (char *string, size_t max) {
++	size_t offset=0;
++
++	while ((offset < max) && (string[offset] != '\n') && (string[offset] != '\r'))
++		offset++;
++
++	if (string[offset] == '\r') {
++		string[offset]='\0';
++		offset++;
++	}
++	if (string[offset] == '\n') {
++		string[offset]='\0';
++		offset++;
++	}
++
++	return offset;
++}
++
++
++/*
++ * ReadMimeEncodedInput - handles things that are mime encoded
++ * takes a pointer to the input; returns 0 on success
++ */
++
++static int ReadMimeEncodedInput(char *qs) 
++{
++	char 	*boundary;
++	char	*ct;
++	int	i;
++	int	datastart;
++ 	size_t	cl;
++	size_t	offset;
++	char    *envname;
++	char	*filename;
++	char 	*ptr;
++	int	line;
++	char 	tmpname[] = TEMPDIR "/XXXXXX";
++	int	fd;
++	/* we should only get here if the content type was set. Segfaults happen
++	   if Content_Type is null */
++
++	if (getenv("CONTENT_LENGTH") == NULL)
++		/* No content length?! */
++		return(-1);
++
++	cl=atoi(getenv("CONTENT_LENGTH"));
++	
++	/* we do this 'cause we can't mess with the real env. variable - it would
++	 * overwrite the environment - I tried.
++	 */
++	i=strlen(getenv("CONTENT_TYPE"))+1;
++	ct=malloc(i);
++	if (ct)
++		memcpy(ct, getenv("CONTENT_TYPE"), i);
++	else
++		return(-1);
++	
++	i=(int) NULL;
++ 	if (ct != NULL) {
++		while (i < strlen(ct) && (strncmp("boundary=", &ct[i], 9) != 0)) 
++			i++;
++	}
++	if (i == strlen(ct)) {
++		/* no boundary informaiton found */
++		free(ct);
++		return -1;
++	}
++	boundary=&ct[i+7];
++	/* add two leading -- to the boundary */
++	boundary[0]='-';
++	boundary[1]='-';
++	
++	/* begin the big loop.  Look for:
++		--boundary
++		Content-Disposition: form-data;  name="......." 
++		....
++		<blank line>
++		content
++		--boundary
++		Content-Disposition: form-data; name="....." filename="....."
++		...
++		<blank line>
++		--boundary--
++		eof
++	*/
++
++	offset=0;
++	while (offset < cl) {
++		/* first look for boundary */
++		while ((offset < cl) && (memcmp(&qs[offset], boundary, strlen(boundary)))) 
++			offset++;
++
++		/* if we got here and we ran off the end, its an error 		*/
++		if (offset >= cl) { 
++			free(ct);
++			return -1;
++		}
++
++		/* if the two characters following the boundary are --, 	*/ 
++		/* then we are at the end, exit 				*/
++		if (memcmp(&qs[offset+strlen(boundary)], "--", 2) == 0) {
++			offset+=2;
++			break;
++		}
++		/* find where the offset should be */
++		line=LineToStr(&qs[offset], cl-offset);
++		offset+=line;
++				
++		/* Now we're going to look for content-disposition		*/ 
++		line=LineToStr(&qs[offset], cl-offset);
++		if (strncasecmp(&qs[offset], "Content-Disposition", 19) != 0) {
++			/* hmm... content disposition was not where we expected it */
++			free(ct);
++			return -1;
++		}
++		/* Found it, so let's go find "name="				*/
++	 	if (!(envname=strstr(&qs[offset], "name="))) {
++			/* now name= is missing?!  				*/
++			free(ct);
++			return(-1);
++		} else
++			envname+=6;
++
++		/* is there a filename tag? 					*/
++		if ((filename=strstr(&qs[offset], "filename="))!= NULL)
++			filename+=10;
++		else
++			filename=NULL;
++		
++		/* make envname and filename ASCIIZ				*/
++		for (i=0; (envname[i] != '"') && (envname[i] != '\0'); i++);
++		
++		envname[i] = '\0';
++		if (filename) {
++			for (i=0; (filename[i] != '"') && (filename[i] != '\0'); i++);
++			filename[i] = '\0';
++		}
++		offset+=line;
++		
++		/* Ok, by some miracle, we have the name; let's skip till we	*/
++		/* come to a blank line						*/
++		line=LineToStr(&qs[offset], cl-offset);
++		while (strlen(&qs[offset]) > 1) {
++			offset+=line;
++			line=LineToStr(&qs[offset], cl-offset);
++		}
++		offset+=line;
++		datastart=offset;
++		/* And we go back to looking for a boundary */
++		while ((offset < cl) && (memcmp(&qs[offset], boundary, strlen(boundary))))
++			offset++;
++
++		/* strip [cr] lf */
++		if ((qs[offset-1] == '\n') && (qs[offset-2] == '\r'))
++			offset-=2; 
++		else
++			offset-=1;
++
++		qs[offset]=0;
++
++		/* ok, at this point, we know where the name is, and we know    */
++		/* where the content is... we have to do one of two things      */
++		/* based on whether its a file or not				*/
++		if (filename==NULL) { /* its not a file, so its easy		*/
++			/* just jam the content after the name		*/
++			memcpy(&envname[strlen(envname)+1], &qs[datastart], offset-datastart+1);
++			envname[strlen(envname)]='=';
++			put_var(FORM_VAR, envname);
++		} else {	/* handle the fileupload case		*/
++			if (offset-datastart) {  /* only if they uploaded */
++				if ( global_upload_size == 0 ) {
++					return -1;
++				}
++				/*  stuff in the filename */
++				ptr= calloc ( sizeof (char), strlen(envname)+strlen(filename)+2+5 );
++				sprintf (ptr, "%s_name=%s", envname, filename);
++				put_var(FORM_VAR, ptr);
++				free(ptr);
++						
++				fd=mkstemp(tmpname);
++				
++				if (fd == -1)
++					return(-1);
++
++				write(fd, &qs[datastart], offset-datastart);
++				close(fd);
++				ptr= calloc (sizeof(char), strlen(envname)+strlen(tmpname)+2);
++				sprintf (ptr, "%s=%s", envname, tmpname);
++				put_var(FORM_VAR, ptr);
++				free(ptr);
++			}
++		}
++	}
++	free(ct);
++	return 0;
++}
++
++	
++/*-------------------------------------------------------------------------
++ *
++ * Main 
++ *
++ *------------------------------------------------------------------------*/
++
++int cgi_init(var_handler putvar_handler)
++{
++	int	retval = 0;
++	
++	do_putvar = putvar_handler;
++
++	/* Read the current environment into our chain */
++	CookieVars();
++	if (getenv("REQUEST_METHOD")) {
++		if (strcasecmp(getenv("REQUEST_METHOD"), "GET") == 0)
++			retval = ReadCGIQueryString();
++
++		if (strcasecmp(getenv("REQUEST_METHOD"), "POST") == 0)
++			retval = ReadCGIPOSTValues();
++	}
++
++	return retval;
++} 
+Index: busybox-1.4.2/libbb/Kbuild
+===================================================================
+--- busybox-1.4.2.orig/libbb/Kbuild	2007-06-04 13:21:37.710243840 +0200
++++ busybox-1.4.2/libbb/Kbuild	2007-06-04 13:21:37.930210400 +0200
+@@ -118,3 +118,6 @@
+ lib-$(CONFIG_MDEV) += xregcomp.o
+ lib-$(CONFIG_LESS) += xregcomp.o
+ lib-$(CONFIG_DEVFSD) += xregcomp.o
++
++lib-$(CONFIG_AWX) += cgi.o
++