aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--doc/ChangeLog2
-rw-r--r--doc/gawk.127
-rw-r--r--main.c16
4 files changed, 8 insertions, 42 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fc90f0f..a1f59dab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-06 Arnold D. Robbins <arnold@skeeve.com>
+
+ * main.c (main): Remove undocumented -m option which was for
+ compatibility with BWK awk. His awk dropped it back in 2007.
+
2013-02-04 Arnold D. Robbins <arnold@skeeve.com>
* regcomp.c, regex.c, regex_internal.c, regexec.c: Update
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5e82cf9c..0e0f912c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -3,6 +3,8 @@
* gawk.texi: For Info output, don't use @center on text images
since the new makeinfo doesn't yet center the file as a block.
Thanks to Karl Berry for the diagnostic.
+ * gawk.1: Remove commented out doc for -m option which was for
+ compatibility with BWK awk. His awk dropped it back in 2007.
2013-01-31 Arnold D. Robbins <arnold@skeeve.com>
diff --git a/doc/gawk.1 b/doc/gawk.1
index 8bc14bf6..90288db5 100644
--- a/doc/gawk.1
+++ b/doc/gawk.1
@@ -159,33 +159,6 @@ before execution of the program begins.
Such variable values are available to the
.B BEGIN
block of an \*(AK program.
-.ig
-.TP
-.PD 0
-.BI \-mf " NNN"
-.TP
-.PD
-.BI \-mr " NNN"
-Set various memory limits to the value
-.IR NNN .
-The
-.B f
-flag sets the maximum number of fields, and the
-.B r
-flag sets the maximum record size. These two flags and the
-.B \-m
-option are from an earlier version of the Bell Laboratories
-research version of \*(UX
-.IR awk .
-They are ignored by
-.IR gawk ,
-since
-.I gawk
-has no pre-defined limits.
-(Current versions of the Bell Laboratories
-.I awk
-no longer accept them.)
-..
.TP
.PD 0
.B \-b
diff --git a/main.c b/main.c
index c3adc9f5..785935e4 100644
--- a/main.c
+++ b/main.c
@@ -201,7 +201,7 @@ main(int argc, char **argv)
/*
* The + on the front tells GNU getopt not to rearrange argv.
*/
- const char *optlist = "+F:f:v:W;m:bcCd::D::e:E:gh:i:l:L:nNo::Op::MPrStVY";
+ const char *optlist = "+F:f:v:W;bcCd::D::e:E:gh:i:l:L:nNo::Op::MPrStVY";
bool stopped_early = false;
int old_optind;
int i;
@@ -348,20 +348,6 @@ main(int argc, char **argv)
add_preassign(PRE_ASSIGN, optarg);
break;
- case 'm':
- /*
- * BWK awk extension.
- * -mf nnn set # fields, gawk ignores
- * -mr nnn set record length, ditto
- *
- * As of at least 10/2007, BWK awk also ignores it.
- */
- if (do_lint)
- lintwarn(_("`-m[fr]' option irrelevant in gawk"));
- if (optarg[0] != 'r' && optarg[0] != 'f')
- warning(_("-m option usage: `-m[fr] nnn'"));
- break;
-
case 'b':
do_binary = true;
break;