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

diff --git a/package/busybox/patches/510-awk_include.patch b/package/busybox/patches/510-awk_include.patch
index c2d3040fc..b185408a9 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 */
-@@ -1395,7 +1400,8 @@ static void parse_program(char *p)
+@@ -1400,7 +1405,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);
-@@ -1404,7 +1410,7 @@ static void parse_program(char *p)
+@@ -1409,7 +1415,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);
  
-@@ -2367,7 +2373,8 @@ static var *evaluate(node *op, var *res)
+@@ -2374,7 +2380,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);
-@@ -2384,7 +2391,10 @@ static var *evaluate(node *op, var *res)
+@@ -2391,7 +2398,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);
-@@ -2747,6 +2757,143 @@ static rstream *next_input_file(void)
+@@ -2754,6 +2764,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)
  {
-@@ -2812,6 +2959,9 @@ int awk_main(int argc, char **argv)
+@@ -2819,6 +2966,9 @@ int awk_main(int argc, char **argv)
  			*s1 = '=';
  		}
  	}