Hi Jason.

Thank you very much for managing these small bugs so fast.

The first patch is for main.c:


--- main.c      Mon Jan 29 15:01:20 2007
+++ main.c      Mon Jan 29 15:04:28 2007
@@ -63,8 +63,8 @@
        setlocale(LC_NUMERIC, "C"); /* for parsing cmdline & prog */
        cmdname = __progname;
        if (argc == 1) {
-               fprintf(stderr, "usage: %s [-safe] [-V] [-d[n]] [-F fs] "
-                   "[-v var=value] [prog | -f progfile]\n\tfile ...\n",
+               fprintf(stderr, "usage: %s [-sae] [-V] [-d[n]] [-F fs] "
+                   "[-v var=value] [prog | -f progfile]\n\t   file ...\n",
                    cmdname);
                exit(1);
        }
@@ -110,10 +110,6 @@
                case 'v':       /* -v a=1 to be done NOW.  one -v for each */
                        if (argv[1][2] == '\0' && --argc > 1 && 
isclvar((++argv)[1]))
                                setclvar(argv[1]);
-                       break;
-               case 'm':       /* more memory: -mr=record, -mf=fields */
-                               /* no longer supported */
-                       WARNING("obsolete option %s ignored", argv[1]);
                        break;
                case 'd':
                        dbg = atoi(&argv[1][2]);


Changes introduced by this patch:

  - adds three spaces after the tab character to improve readability
    of the usage message.
  - removes the "f" option in "-safe", it seems that the argument
    to "-f" is not optional.
  - removes the case for "m", that is now managed by the default case:

       # awk -mr   
       awk: unknown option -mr ignored

       awk: no program given

The second one fixes the man page for awk.1:


--- awk.1       Mon Jan 29 15:01:15 2007
+++ awk.1       Mon Jan 29 15:01:30 2007
@@ -31,7 +31,7 @@
 .Nd pattern-directed scanning and processing language
 .Sh SYNOPSIS
 .Nm awk
-.Op Fl safe
+.Op Fl sae
 .Op Fl V
 .Op Fl d Ns Op Ar n
 .Op Fl F Ar fs


By the way, thank you very much for changing the "filename" argument
of "-f" to "progfile".  A good change!

Igor.

Reply via email to