[package] dnsmasq: remove redundant code introduced with r20074

[openwrt.git] / package / busybox / patches / 510-awk_include.patch

diff --git a/package/busybox/patches/510-awk_include.patch b/package/busybox/patches/510-awk_include.patch
index c2d3040..b9d7d71 100644 (file)
--- a/package/busybox/patches/510-awk_include.patch
+++ b/package/busybox/patches/510-awk_include.patch
@@ -15,7 +15,7 @@
  } func;
  
  /* I/O stream */
  } func;
  
  /* I/O stream */

-@@ -1395,7 +1400,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);
                        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);
                        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)
+@@ -1429,7 +1435,7 @@ static void parse_program(char *p)

                                if (next_token(TC_COMMA | TC_SEQTERM) & TC_SEQTERM)
                                        break;
                        }
                                if (next_token(TC_COMMA | TC_SEQTERM) & TC_SEQTERM)
                                        break;
                        }


@@ -34,7 +34,7 @@
                        chain_group();
                        clear_array(ahash);
  
                        chain_group();
                        clear_array(ahash);
  

-@@ -2367,7 +2373,8 @@ static var *evaluate(node *op, var *res)
+@@ -2410,7 +2416,8 @@ static var *evaluate(node *op, var *res)

                        break;
  
                case XC( OC_FUNC ):
                        break;
  
                case XC( OC_FUNC ):


@@ -44,7 +44,7 @@
                                syntax_error(EMSG_UNDEF_FUNC);
  
                        X.v = R.v = nvalloc(op->r.f->nargs+1);
                                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)
+@@ -2427,7 +2434,10 @@ static var *evaluate(node *op, var *res)

                        fnargs = X.v;
  
                        L.s = g_progname;
                        fnargs = X.v;
  
                        L.s = g_progname;


@@ -56,7 +56,7 @@
                        g_progname = L.s;
  
                        nvfree(fnargs);
                        g_progname = L.s;
  
                        nvfree(fnargs);

-@@ -2747,6 +2757,143 @@ static rstream *next_input_file(void)
+@@ -2790,6 +2800,143 @@ static rstream *next_input_file(void)

  #undef files_happen
  }
  
  #undef files_happen
  }
  


@@ -200,7 +200,7 @@
  int awk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int awk_main(int argc, char **argv)
  {
  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)
+@@ -2855,6 +3002,9 @@ int awk_main(int argc, char **argv)

                        *s1 = '=';
                }
        }
                        *s1 = '=';
                }
        }