[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] gawk branch, gawk-5.3-stable, updated. gawk-4.1.0-5481-g6b237fa6
From: |
Arnold Robbins |
Subject: |
[SCM] gawk branch, gawk-5.3-stable, updated. gawk-4.1.0-5481-g6b237fa6 |
Date: |
Mon, 10 Jun 2024 15:29:56 -0400 (EDT) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".
The branch, gawk-5.3-stable has been updated
via 6b237fa6db5a28d6598cb0fb67b9324cf2d88432 (commit)
from 5330a01d18da651654f232d1b69816bfb5aed15f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=6b237fa6db5a28d6598cb0fb67b9324cf2d88432
commit 6b237fa6db5a28d6598cb0fb67b9324cf2d88432
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Mon Jun 10 22:29:29 2024 +0300
Remove undocumented --nostalgia option.
diff --git a/ChangeLog b/ChangeLog
index 40182148..d43486fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-06-10 Arnold D. Robbins <arnold@skeeve.com>
+
+ * main.c (nostalgia): Remved function.
+ [COPYRIGHT_YEAR]: Bumped to 2024.
+ (main): Removed --nostalgia from options and from handling.
+ * NEWS: Updated.
+
2024-06-08 Arnold D. Robbins <arnold@skeeve.com>
* io.c: Remove check for OSF/1. It's too obsolete now.
diff --git a/NEWS b/NEWS
index 47804114..01f25825 100644
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,10 @@ Changes from 5.3.0 to 5.3.x
6. Support for OSF/1 has been removed.
-7. As usual, there have been several minor code cleanups and bug fixes.
+7. The never-documented --nostalgia option has been removed. It was
+ causing bug reports.
+
+8. As usual, there have been several minor code cleanups and bug fixes.
See the ChangeLog for details.
Changes from 5.2.x to 5.3.0
diff --git a/doc/ChangeLog b/doc/ChangeLog
index fb60bca7..8dab6331 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-10 Arnold D. Robbins <arnold@skeeve.com>
+
+ * gawk.texi, awkcard.in, gawk.1: Removed hidden references to
+ --nostalgia option.
+
2024-06-08 Arnold D. Robbins <arnold@skeeve.com>
* gawk.texi (Feature History): Document removal of support
diff --git a/doc/awkcard.in b/doc/awkcard.in
index bbbb288b..8a22e1c2 100644
--- a/doc/awkcard.in
+++ b/doc/awkcard.in
@@ -223,13 +223,6 @@ remains unique.
Use ``\*(FC\-W \*(FIoption\*(FR''
for full POSIX compliance.
.sp .5
-.ig
-.\" This option is left undocumented, on purpose.
-\*(FC\-\^\-nostalgia\*(FR%T{
-provide a moment of nostalgia for
-long time \*(AK users.
-T}
-..
.de TI \" table item
.ti -4n
\\$1
diff --git a/doc/gawk.1 b/doc/gawk.1
index 2154b228..d69cb4e8 100644
--- a/doc/gawk.1
+++ b/doc/gawk.1
@@ -284,14 +284,6 @@ Recognize octal and hexadecimal values in input data.
Force
.I gawk
to use the locale's decimal point character when parsing input data.
-.ig
-.\" This option is left undocumented, on purpose.
-.TP
-.BR "\-W nostalgia" ", " \-\^\-nostalgia
-Provide a moment of nostalgia for long time
-.I awk
-users.
-..
.TP
\fB\-o\fR[\fIfile\fR], \fB\-\^\-pretty-print\fR[\fB=\fIfile\fR]
Output a pretty printed version of the program to
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 70e72e41..0b28605c 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -5203,18 +5203,6 @@ blank.
@c If these came out in the Info file or TeX document, then they wouldn't
@c be undocumented, would they?
-@command{gawk} has one undocumented option:
-
-@table @code
-@item -W nostalgia
-@itemx --nostalgia
-Print the message @samp{awk: bailing out near line 1} and dump core.
-This option was inspired by the common behavior of very early versions of
-Unix @command{awk} and by a t--shirt.
-The message is @emph{not} subject to translation in non-English locales.
-@c so there! nyah, nyah.
-@end table
-
Early versions of @command{awk} used to not require any separator (either
a newline or @samp{;}) between the rules in @command{awk} programs. Thus,
it was common to see one-line programs like:
@@ -41643,6 +41631,13 @@ environments.
@item
Support for OSF/1 was removed.
+@ignore
+@item
+The undocumented @option{--nostalgia} was removed; it was
+causing bug reports, especially downstream in some of the
+GNU/Linux distributions.
+@end ignore
+
@end itemize
@c XXX ADD MORE STUFF HERE
diff --git a/main.c b/main.c
index 8a1adda7..4ef0208d 100644
--- a/main.c
+++ b/main.c
@@ -3,7 +3,7 @@
*/
/*
- * Copyright (C) 1986, 1988, 1989, 1991-2023,
+ * Copyright (C) 1986, 1988, 1989, 1991-2024,
* the Free Software Foundation, Inc.
*
* This file is part of GAWK, the GNU implementation of the
@@ -25,7 +25,7 @@
*/
/* FIX THIS BEFORE EVERY RELEASE: */
-#define UPDATE_YEAR 2023
+#define UPDATE_YEAR 2024
#include "awk.h"
#include "getopt.h"
@@ -50,7 +50,6 @@ static void init_vars(void);
static NODE *load_environ(void);
static NODE *load_procinfo(void);
static void catchsig(int sig);
-static void nostalgia(void) ATTRIBUTE_NORETURN;
static void version(void) ATTRIBUTE_NORETURN;
static void init_fds(void);
static void init_groupset(void);
@@ -137,7 +136,6 @@ bool using_persistent_malloc = false;
enum do_flag_values do_flags = DO_FLAG_NONE;
bool do_itrace = false; /* provide simple instruction
trace */
bool do_optimize = true; /* apply default optimizations */
-static int do_nostalgia = false; /* provide a blast from the past */
static int do_binary = false; /* hands off my data! */
static int do_version = false; /* print version info */
static const char *locale = ""; /* default value to setlocale */
@@ -188,7 +186,6 @@ static const struct option optab[] = {
#endif
{ "non-decimal-data", no_argument, NULL, 'n' },
{ "no-optimize", no_argument, NULL, 's' },
- { "nostalgia", no_argument, & do_nostalgia, 1 },
{ "optimize", no_argument, NULL, 'O' },
#if defined(YYDEBUG) || defined(GAWKDEBUG)
{ "parsedebug", no_argument, NULL, 'Y' },
@@ -336,9 +333,6 @@ main(int argc, char **argv)
if (gawk_mb_cur_max == 1)
load_casetable();
- if (do_nostalgia)
- nostalgia();
-
/* check for POSIXLY_CORRECT environment variable */
if (! do_posix && getenv("POSIXLY_CORRECT") != NULL) {
do_flags |= DO_POSIX;
@@ -651,9 +645,6 @@ usage(int exitval, FILE *fp)
fputs(_("\t-S\t\t\t--sandbox\n"), fp);
fputs(_("\t-t\t\t\t--lint-old\n"), fp);
fputs(_("\t-V\t\t\t--version\n"), fp);
-#ifdef NOSTALGIA
- fputs(_("\t-W nostalgia\t\t--nostalgia\n"), fp);
-#endif
#ifdef GAWKDEBUG
fputs(_("\t-Y\t\t\t--parsedebug\n"), fp);
#endif
@@ -1346,20 +1337,6 @@ catchsig(int sig)
/* NOTREACHED */
}
-/* nostalgia --- print the famous error message and die */
-
-static void
-nostalgia()
-{
- /*
- * N.B.: This string is not gettextized, on purpose.
- * So there.
- */
- fprintf(stderr, "awk: bailing out near line 1\n");
- fflush(stderr);
- abort();
-}
-
#ifdef USE_PERSISTENT_MALLOC
/* get_pma_version --- get a usable version string out of PMA */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
NEWS | 5 ++++-
doc/ChangeLog | 5 +++++
doc/awkcard.in | 7 -------
doc/gawk.1 | 8 --------
doc/gawk.texi | 19 +++++++------------
main.c | 27 ++-------------------------
7 files changed, 25 insertions(+), 53 deletions(-)
hooks/post-receive
--
gawk
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] gawk branch, gawk-5.3-stable, updated. gawk-4.1.0-5481-g6b237fa6,
Arnold Robbins <=