X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=package%2Fbusybox%2Fpatches%2F510-awk_include.patch;h=50f6cc549af001c57925a13cbb50788f9e655d85;hb=9dfc3e34ee54d00b68cc4cbb5cddcfa588fd07fb;hp=b185408a9905b71fb3690daf518255e654b714c9;hpb=396dbf68b1cfdce2e6f455b5ec646b4c5b65c55e;p=openwrt-10.03%2F.git

diff --git a/package/busybox/patches/510-awk_include.patch b/package/busybox/patches/510-awk_include.patch
index b185408a9..50f6cc549 100644
--- a/package/busybox/patches/510-awk_include.patch
+++ b/package/busybox/patches/510-awk_include.patch
@@ -15,7 +15,7 @@
  } func;
  
  /* I/O stream */
-@@ -1400,7 +1405,8 @@ static void parse_program(char *p)
+@@ -1420,7 +1425,8 @@ static void parse_program(char *p)
  			next_token(TC_FUNCTION);
  			g_pos++;
  			f = newfunc(t_string);
@@ -25,7 +25,7 @@
  			f->nargs = 0;
  			while (next_token(TC_VARIABLE | TC_SEQTERM) & TC_VARIABLE) {
  				v = findvar(ahash, t_string);
-@@ -1409,7 +1415,7 @@ static void parse_program(char *p)
+@@ -1429,7 +1435,7 @@ static void parse_program(char *p)
  				if (next_token(TC_COMMA | TC_SEQTERM) & TC_SEQTERM)
  					break;
  			}
@@ -34,7 +34,7 @@
  			chain_group();
  			clear_array(ahash);
  
-@@ -2374,7 +2380,8 @@ static var *evaluate(node *op, var *res)
+@@ -2408,7 +2414,8 @@ static var *evaluate(node *op, var *res)
  			break;
  
  		case XC( OC_FUNC ):
@@ -44,7 +44,7 @@
  				syntax_error(EMSG_UNDEF_FUNC);
  
  			X.v = R.v = nvalloc(op->r.f->nargs+1);
-@@ -2391,7 +2398,10 @@ static var *evaluate(node *op, var *res)
+@@ -2425,7 +2432,10 @@ static var *evaluate(node *op, var *res)
  			fnargs = X.v;
  
  			L.s = g_progname;
@@ -56,7 +56,7 @@
  			g_progname = L.s;
  
  			nvfree(fnargs);
-@@ -2754,6 +2764,143 @@ static rstream *next_input_file(void)
+@@ -2788,6 +2798,143 @@ static rstream *next_input_file(void)
  #undef files_happen
  }
  
@@ -200,7 +200,7 @@
  int awk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int awk_main(int argc, char **argv)
  {
-@@ -2819,6 +2966,9 @@ int awk_main(int argc, char **argv)
+@@ -2853,6 +3000,9 @@ int awk_main(int argc, char **argv)
  			*s1 = '=';
  		}
  	}