package/busybox/patches/400-revert_awk_getopt.patch

   1 diff -ur busybox.old/editors/awk.c busybox.dev/editors/awk.c
   2 --- busybox.old/editors/awk.c   2007-01-19 22:23:12.000000000 +0100
   3 +++ busybox.dev/editors/awk.c   2007-01-25 20:01:26.000000000 +0100
   4 @@ -2639,14 +2639,13 @@
   5
   6  int awk_main(int argc, char **argv)
   7  {
   8 -       unsigned opt;
   9 -       char *opt_F, *opt_v, *opt_W;
  10         int i, j, flen;
  11         var *v;
  12         var tv;
  13         char **envp;
  14         char *vnames = (char *)vNames; /* cheat */
  15         char *vvalues = (char *)vValues;
  16 +       int c;
  17
  18         /* Undo busybox.c, or else strtod may eat ','! This breaks parsing:
  19          * $1,$2 == '$1,' '$2', NOT '$1' ',' '$2' */
  20 @@ -2694,39 +2693,46 @@
  21                 free(s);
  22         }
  23
  24 -       opt = getopt32(argc, argv, "F:v:f:W:", &opt_F, &opt_v, &programname, &opt_W);
  25 -       argv += optind;
  26 -       argc -= optind;
  27 -       if (opt & 0x1) setvar_s(V[FS], opt_F); // -F
  28 -       if (opt & 0x2) if (!is_assignment(opt_v)) bb_show_usage(); // -v
  29 -       if (opt & 0x4) { // -f
  30 -               char *s = s; /* die, gcc, die */
  31 -               FILE *from_file = afopen(programname, "r");
  32 -               /* one byte is reserved for some trick in next_token */
  33 -               if (fseek(from_file, 0, SEEK_END) == 0) {
  34 -                       flen = ftell(from_file);
  35 -                       s = xmalloc(flen + 4);
  36 -                       fseek(from_file, 0, SEEK_SET);
  37 -                       i = 1 + fread(s + 1, 1, flen, from_file);
  38 -               } else {
  39 -                       for (i = j = 1; j > 0; i += j) {
  40 -                               s = xrealloc(s, i + 4096);
  41 -                               j = fread(s + i, 1, 4094, from_file);
  42 +       while((c = getopt(argc, argv, "F:v:f:W:")) != EOF) {
  43 +               switch (c) {
  44 +                       case 'F':
  45 +                               setvar_s(V[FS], optarg);
  46 +                               break;
  47 +                       case 'v':
  48 +                               if (! is_assignment(optarg))
  49 +                                       bb_show_usage();
  50 +                               break;
  51 +                       case 'f': {
  52 +                               FILE *F = afopen(programname = optarg, "r");
  53 +                               char *s = NULL;
  54 +                               /* one byte is reserved for some trick in next_token */
  55 +                               if (fseek(F, 0, SEEK_END) == 0) {
  56 +                                       flen = ftell(F);
  57 +                                       s = (char *)xmalloc(flen+4);
  58 +                                       fseek(F, 0, SEEK_SET);
  59 +                                       i = 1 + fread(s+1, 1, flen, F);
  60 +                               } else {
  61 +                                       for (i=j=1; j>0; i+=j) {
  62 +                                               s = (char *)xrealloc(s, i+4096);
  63 +                                               j = fread(s+i, 1, 4094, F);
  64 +                                       }
  65 +                               }
  66 +                               s[i] = '\0';
  67 +                               fclose(F);
  68 +                               parse_program(s+1);
  69 +                               free(s);
  70 +                               break;
  71                         }
  72 +                       case 'W':
  73 +                               bb_error_msg("Warning: unrecognized option '-W %s' ignored\n", optarg);
  74 +                               break;
  75 +
  76 +                       default:
  77 +                               bb_show_usage();
  78                 }
  79 -               s[i] = '\0';
  80 -               fclose(from_file);
  81 -               parse_program(s + 1);
  82 -               free(s);
  83 -       } else { // no -f: take program from 1st parameter
  84 -               if (!argc)
  85 -                       bb_show_usage();
  86 -               programname = "cmd. line";
  87 -               parse_program(*argv++);
  88 -               argc--;
  89         }
  90 -       if (opt & 0x8) // -W
  91 -               bb_error_msg("warning: unrecognized option '-W %s' ignored", opt_W);
  92 +       argc -= optind;
  93 +       argv += optind;
  94
  95         /* fill in ARGV array */
  96         setvar_i(V[ARGC], argc + 1);